[PATCH V2] ASoC: fsl-asoc-card: move 'config SND_SOC_FSL_ASOC_CARD' to 'if SND_IMX_SOC'

2014-08-19 Thread Shengjiu Wang
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: kbuild test robot fengguang...@intel.com
Signed-off-by: Shengjiu Wang shengjiu.w...@freescale.com
---
 sound/soc/fsl/Kconfig |   34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 417ff70..9348fef 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -58,23 +58,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
@@ -285,6 +268,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
-- 
1.7.9.5

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [PATCH V2] ASoC: fsl-asoc-card: move 'config SND_SOC_FSL_ASOC_CARD' to 'if SND_IMX_SOC'

2014-08-19 Thread Mark Brown
On Tue, Aug 19, 2014 at 05:36:41PM +0800, Shengjiu Wang wrote:
 Build kernel with SND_SOC_FSL_ASOC_CARD=m  SND_SOC_FSL_{SSI,SAI,ESAI}=y
 leads the following error:

Applied, thanks.


signature.asc
Description: Digital signature
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev