[armhf] ASoC: fsl: Fix module build
svn path=/dists/trunk/linux/; revision=20625
This commit is contained in:
parent
df14044f37
commit
e38c78d459
|
@ -6,6 +6,7 @@ linux (3.11-1~exp2) UNRELEASED; urgency=low
|
||||||
- Remove aic7xxx_old, enc28j60 and imm from module lists
|
- Remove aic7xxx_old, enc28j60 and imm from module lists
|
||||||
- [sh4] kernel-image no longer provides ext3-modules
|
- [sh4] kernel-image no longer provides ext3-modules
|
||||||
* [hppa] udeb: kernel-image does not provide ext2-modules (since 3.2.7-1)
|
* [hppa] udeb: kernel-image does not provide ext2-modules (since 3.2.7-1)
|
||||||
|
* [armhf] ASoC: fsl: Fix module build
|
||||||
|
|
||||||
-- Ben Hutchings <ben@decadent.org.uk> Fri, 13 Sep 2013 04:37:21 +0100
|
-- Ben Hutchings <ben@decadent.org.uk> Fri, 13 Sep 2013 04:37:21 +0100
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,66 @@
|
||||||
|
From: Fabio Estevam <fabio.estevam@freescale.com>
|
||||||
|
Date: Mon, 29 Jul 2013 18:37:32 -0300
|
||||||
|
Subject: ASoC: fsl: Fix module build
|
||||||
|
Origin: https://git.kernel.org/linus/3f1a91aa25579ba5e7268a47a73d2a83e4802c62
|
||||||
|
|
||||||
|
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>
|
||||||
|
[bwh: Adjusted context for 3.11. This 'fix' just seems like a
|
||||||
|
workaround as it should always be OK for a module to use a built-in
|
||||||
|
symbol, but I don't have time to work but what's really going wrong.]
|
||||||
|
---
|
||||||
|
sound/soc/fsl/Kconfig | 4 ++--
|
||||||
|
sound/soc/fsl/imx-pcm.h | 4 ++--
|
||||||
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
--- a/sound/soc/fsl/Kconfig
|
||||||
|
+++ b/sound/soc/fsl/Kconfig
|
||||||
|
@@ -109,11 +109,11 @@ config SND_SOC_IMX_SSI
|
||||||
|
tristate
|
||||||
|
|
||||||
|
config SND_SOC_IMX_PCM_FIQ
|
||||||
|
- bool
|
||||||
|
+ tristate
|
||||||
|
select FIQ
|
||||||
|
|
||||||
|
config SND_SOC_IMX_PCM_DMA
|
||||||
|
- bool
|
||||||
|
+ tristate
|
||||||
|
select SND_SOC_GENERIC_DMAENGINE_PCM
|
||||||
|
|
||||||
|
config SND_SOC_IMX_AUDMUX
|
||||||
|
--- a/sound/soc/fsl/imx-pcm.h
|
||||||
|
+++ b/sound/soc/fsl/imx-pcm.h
|
||||||
|
@@ -32,7 +32,7 @@ imx_pcm_dma_params_init_data(struct imx_
|
||||||
|
dma_data->peripheral_type = IMX_DMATYPE_SSI;
|
||||||
|
}
|
||||||
|
|
||||||
|
-#ifdef CONFIG_SND_SOC_IMX_PCM_DMA
|
||||||
|
+#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_DMA)
|
||||||
|
int imx_pcm_dma_init(struct platform_device *pdev);
|
||||||
|
void imx_pcm_dma_exit(struct platform_device *pdev);
|
||||||
|
#else
|
||||||
|
@@ -46,7 +46,7 @@ static inline void imx_pcm_dma_exit(stru
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#ifdef CONFIG_SND_SOC_IMX_PCM_FIQ
|
||||||
|
+#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_FIQ)
|
||||||
|
int imx_pcm_fiq_init(struct platform_device *pdev);
|
||||||
|
void imx_pcm_fiq_exit(struct platform_device *pdev);
|
||||||
|
#else
|
|
@ -87,3 +87,4 @@ bugfix/all/HID-ntrig-validate-feature-report-details.patch
|
||||||
bugfix/all/HID-sensor-hub-validate-feature-report-details.patch
|
bugfix/all/HID-sensor-hub-validate-feature-report-details.patch
|
||||||
bugfix/all/HID-picolcd_core-validate-output-report-details.patch
|
bugfix/all/HID-picolcd_core-validate-output-report-details.patch
|
||||||
bugfix/all/HID-check-for-NULL-field-when-setting-values.patch
|
bugfix/all/HID-check-for-NULL-field-when-setting-values.patch
|
||||||
|
bugfix/arm/ASoC-fsl-Fix-module-build.patch
|
||||||
|
|
Loading…
Reference in New Issue