From patchwork Mon Feb 6 12:27:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9557703 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3C22360236 for ; Mon, 6 Feb 2017 12:35:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B7B222701 for ; Mon, 6 Feb 2017 12:35:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1DB792654B; Mon, 6 Feb 2017 12:35:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B93D22701 for ; Mon, 6 Feb 2017 12:35:35 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 8CBA3266DA4; Mon, 6 Feb 2017 13:28:36 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 4ED62266DA5; Mon, 6 Feb 2017 13:28:35 +0100 (CET) Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.74]) by alsa0.perex.cz (Postfix) with ESMTP id A9271266DA1 for ; Mon, 6 Feb 2017 13:28:33 +0100 (CET) Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0LoqDL-1bvswa0pJr-00gmzQ; Mon, 06 Feb 2017 13:28:27 +0100 From: Arnd Bergmann To: Mark Brown 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= Cc: alsa-devel@alsa-project.org, Lars-Peter Clausen , Arnd Bergmann , Kuninori Morimoto , Liam Girdwood , linux-kernel@vger.kernel.org, Romain Perier Subject: [alsa-devel] [PATCH] ASoC: fix ES8328_I2C/SPI dependencies X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP 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