From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752046AbdBFM2y (ORCPT ); Mon, 6 Feb 2017 07:28:54 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:56747 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751533AbdBFM2w (ORCPT ); Mon, 6 Feb 2017 07:28:52 -0500 From: Arnd Bergmann To: Mark Brown Cc: Arnd Bergmann , Liam Girdwood , Kuninori Morimoto , Lars-Peter Clausen , Romain Perier , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: fix ES8328_I2C/SPI dependencies Date: Mon, 6 Feb 2017 13:27:11 +0100 Message-Id: <20170206122820.1659902-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:HlUEReR8SYe59Z/MN2D0x+ge29IfeIGMP+Umr0bTJeZOlW7CIBM glaeS9mwh8Y6d18aEj7vXB+zdPEEkV1oIEVXakB6puzEclG3VBTlNRCZ81ouNeaXydpuK6K 1hW5o8nNp4z6iXxPxZkMuz6N57a8glGQC8qUmwShOrYglK/IYf02EMwRql4Q4lX2QvCey9d Z4z2au0tTk8jXHFFMiZMA== X-UI-Out-Filterresults: notjunk:1;V01:K0:0SsD9wo0XVM=:GCBFhJBuQYXqqGqYRWMTcc cJUnWzk7NXbY6hs8Bm3XKhstjg/PlK5OX7nhZ0X9mqMRp8Oh/KaeiUKLOULR1HtzDLipwj3xI 6gOYehJfkHSHrM+r3zVNaGslQC47iA0GHOYhuBCC4XMGiKCwiYXsplOkjaJ+CPv55Hr+Wu6Ha iYMEYAVP/Q1Blb01zpfuEYwIwJnZaeQJNiKSnETMlvxfYQ9Xn0nQDrfVtSlI/coNQ73nhctEF xhuoFuWalRNthQWlpJ4kl0rYyfhjwhACXKE6fnG8j5qgoyrwH6/hVJo3W8gZexKIjbSlxGSNH 4zrpF/3ucRvQy5UZbSOfAP0XtpuRMbQbBUHycKiSMyEArNkUkLq/tmgaLKCaDP0tvFGxrRKR/ U4LnorZG562g1KXY6lATRNc6aEI6SfaKnWitn+yWoi3o9Y08RmmS73HLFIjBMdUxBedvcTgv8 tOyPrgifzrGzPtXenHIH2OJBaCZVOcH+z8TupURZK7VbhI0s83DmILbIpdKcOGQBRflm+0d+x 2uZnMNb9k6Dm5uDKycmrq+x9NQnGGdZpxOslobvXWt1O35yjg3BwMpc68mOQPftE3oc/nGUSX PtA57mAbeAgqlccLdQM8zXTouGmgXoaE5SPdNIVy3M0tnYpolZbtAKFwH45FFXA9kICZ/WDJc w5lZ+Um6Jp5yH5k+oByu5JV/GOSM60LaoXFYROW59oyrBq3VxqnzOGj5SH9bMpYYvcY0= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The two front-ends to the codec can now be selected individually, but fail to build when the bus support is missing: sound/built-in.o: In function `es8328_spi_probe': es8328-spi.c:(.text+0x125854): undefined reference to `__devm_regmap_init_spi' sound/built-in.o: In function `es8328_spi_driver_init': es8328-spi.c:(.init.text+0x3589): undefined reference to `__spi_register_driver' Related to this, the added dependency on SND_SOC_ES8328 breaks: warning: (SND_SOC_ALL_CODECS) selects SND_SOC_ES8328_I2C which has unmet direct dependencies (SOUND && !M68K && !UML && SND && SND_SOC && SND_SOC_ES8328 && I2C) This adds the respective Kconfig dependencies and changes SND_SOC_ES8328 to a hidden symbol that is selected implicitly by the two more specific options, as we do for some other codecs. We have to remove the 'depends on' for SND_SOC_IMX_ES8328 in the same step to avoid a recursive dependency. Fixes: aa00f2c8aff7 ("ASoC: Allow to select ES8328_I2C and ES8328_SPI directly") Signed-off-by: Arnd Bergmann --- sound/soc/codecs/Kconfig | 12 +++++++----- sound/soc/fsl/Kconfig | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 37a4a43628b4..e49e9da7f1f6 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -526,15 +526,17 @@ config SND_SOC_HDMI_CODEC select HDMI config SND_SOC_ES8328 - tristate "Everest Semi ES8328 CODEC" + tristate config SND_SOC_ES8328_I2C - depends on SND_SOC_ES8328 - tristate "I2C support for Everest Semi ES8328 CODEC" + tristate "Everest Semi ES8328 CODEC (I2C)" + depends on I2C + select SND_SOC_ES8328 config SND_SOC_ES8328_SPI - depends on SND_SOC_ES8328 - tristate "SPI support for Everest Semi ES8328 CODEC" + tristate "Everest Semi ES8328 CODEC (SPI)" + depends on SPI_MASTER + select SND_SOC_ES8328 config SND_SOC_GTM601 tristate 'GTM601 UMTS modem audio codec' diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 0b914a1ca8d2..37f9b6201918 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -244,7 +244,7 @@ config SND_SOC_IMX_WM8962 config SND_SOC_IMX_ES8328 tristate "SoC Audio support for i.MX boards with the ES8328 codec" - depends on OF && (I2C || SPI) && SND_SOC_ES8328 + depends on OF && (I2C || SPI) select SND_SOC_ES8328_I2C if I2C select SND_SOC_ES8328_SPI if SPI_MASTER select SND_SOC_IMX_PCM_DMA -- 2.9.0