ASoC: fsl: Do not force codecs selection by SND_SOC_FSL_ASOC_CARD
diff mbox

Message ID 1412106735-18892-1-git-send-email-festevam@gmail.com
State Accepted
Commit c05a11f7b8b5bc67f2c9f726c52b59f67b1bfe7d
Headers show

Commit Message

Fabio Estevam Sept. 30, 2014, 7:52 p.m. UTC
From: Fabio Estevam <fabio.estevam@freescale.com>

The wm8962 driver uses the input subsystem, but it is selected by
SND_SOC_FSL_ASOC_CARD, which can be built with CONFIG_INPUT disabled,
resulting in this link error:

ERROR: "input_event" [sound/soc/codecs/snd-soc-wm8962.ko] undefined!
ERROR: "input_register_device" [sound/soc/codecs/snd-soc-wm8962.ko] undefined!
ERROR: "devm_input_allocate_device" [sound/soc/codecs/snd-soc-wm8962.ko] undefined!

Do not force the selection of the codecs by SND_SOC_FSL_ASOC_CARD to avoid
such problem.

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 sound/soc/fsl/Kconfig | 3 ---
 1 file changed, 3 deletions(-)

Comments

Mark Brown Oct. 1, 2014, 4:07 p.m. UTC | #1
On Tue, Sep 30, 2014 at 04:52:15PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> The wm8962 driver uses the input subsystem, but it is selected by
> SND_SOC_FSL_ASOC_CARD, which can be built with CONFIG_INPUT disabled,
> resulting in this link error:

Applied, thanks.  The more important thing here is that this is supposed
to be a generic driver with no dependency on any particular CODEC.

Patch
diff mbox

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 6164e78..081e406 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -288,9 +288,6 @@  config SND_SOC_FSL_ASOC_CARD
 	select SND_SOC_FSL_ESAI
 	select SND_SOC_FSL_SAI
 	select SND_SOC_FSL_SSI
-	select SND_SOC_CS42XX8_I2C
-	select SND_SOC_SGTL5000
-	select SND_SOC_WM8962
 	help
 	 ALSA SoC Audio support with ASRC feature for Freescale SoCs that have
 	 ESAI/SAI/SSI and connect with external CODECs such as WM8962, CS42888