Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38c6e4bb authored by Shengjiu Wang's avatar Shengjiu Wang Committed by Mark Brown
Browse files

ASoC: fsl-asoc-card: move 'config SND_SOC_FSL_ASOC_CARD' to 'if SND_IMX_SOC' 



Build kernel with SND_SOC_FSL_ASOC_CARD=m && SND_SOC_FSL_{SSI,SAI,ESAI}=y
leads the following error:

   sound/built-in.o: In function `fsl_sai_probe':
>> fsl_sai.c:(.text+0x5f662): undefined reference to `imx_pcm_dma_init'
   sound/built-in.o: In function `fsl_esai_probe':
>> fsl_esai.c:(.text+0x6044b): undefined reference to `imx_pcm_dma_init'

The config SND_SOC_FSL_ASOC_CARD is for IMX SOC, So move it under condition
of 'if SND_IMX_SOC'.

Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarShengjiu Wang <shengjiu.wang@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent cdec7297

sound/soc/fsl/Kconfig

+17 −17
Original line number Diff line number Diff line
@@ -59,23 +59,6 @@ config SND_SOC_FSL_ESAI 
config SND_SOC_FSL_UTILS

	tristate



config SND_SOC_FSL_ASOC_CARD

	tristate "Generic ASoC Sound Card with ASRC support"

	depends on OF && I2C

	select SND_SOC_IMX_AUDMUX

	select SND_SOC_IMX_PCM_DMA

	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

	 and SGTL5000.

	 Say Y if you want to add support for Freescale Generic ASoC Sound Card.



config SND_SOC_IMX_PCM_DMA

	tristate

	select SND_SOC_GENERIC_DMAENGINE_PCM
@@ -298,6 +281,23 @@ config SND_SOC_IMX_MC13783 
	select SND_SOC_MC13783

	select SND_SOC_IMX_PCM_DMA



config SND_SOC_FSL_ASOC_CARD

	tristate "Generic ASoC Sound Card with ASRC support"

	depends on OF && I2C

	select SND_SOC_IMX_AUDMUX

	select SND_SOC_IMX_PCM_DMA

	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

	 and SGTL5000.

	 Say Y if you want to add support for Freescale Generic ASoC Sound Card.



endif # SND_IMX_SOC



endmenu