Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3f1a91aa25579ba5e7268a47a73d2a83e4802c62

Authored by Fabio Estevam
Committed by Mark Brown
1 parent 32bd8cd257
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

ASoC: fsl: Fix module build 

Building imx_v6_v7_defconfig with all audio drivers as modules results in
the folowing build error:

ERROR: "imx_pcm_fiq_init" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
ERROR: "imx_pcm_dma_init" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
ERROR: "imx_pcm_fiq_exit" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
ERROR: "imx_pcm_dma_exit" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
ERROR: "imx_pcm_dma_init" [sound/soc/fsl/snd-soc-fsl-ssi.ko] undefined!
ERROR: "imx_pcm_dma_exit" [sound/soc/fsl/snd-soc-fsl-ssi.ko] undefined!

Fix this by allowing SND_SOC_IMX_PCM_FIQ and SND_SOC_IMX_PCM_DMA to be also
built as modules and by using 'IS_ENABLED' to cover the module case.

Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff

sound/soc/fsl/Kconfig
Diff comments   View file @ 3f1a91a
... ... @@ -109,11 +109,11 @@
109 109 tristate
110 110  
111 111 config SND_SOC_IMX_PCM_FIQ
112   - bool
  112 + tristate
113 113 select FIQ
114 114  
115 115 config SND_SOC_IMX_PCM_DMA
116   - bool
  116 + tristate
117 117 select SND_SOC_GENERIC_DMAENGINE_PCM
118 118  
119 119 config SND_SOC_IMX_AUDMUX
sound/soc/fsl/imx-pcm.h
Diff comments   View file @ 3f1a91a
... ... @@ -38,7 +38,7 @@
38 38 struct snd_dmaengine_dai_dma_data *dma_params_tx;
39 39 };
40 40  
41   -#ifdef CONFIG_SND_SOC_IMX_PCM_DMA
  41 +#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_DMA)
42 42 int imx_pcm_dma_init(struct platform_device *pdev);
43 43 void imx_pcm_dma_exit(struct platform_device *pdev);
44 44 #else
... ... @@ -52,7 +52,7 @@
52 52 }
53 53 #endif
54 54  
55   -#ifdef CONFIG_SND_SOC_IMX_PCM_FIQ
  55 +#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_FIQ)
56 56 int imx_pcm_fiq_init(struct platform_device *pdev,
57 57 struct imx_pcm_fiq_params *params);
58 58 void imx_pcm_fiq_exit(struct platform_device *pdev);