From: Greg Kroah-Hartman Date: Thu, 5 Sep 2013 18:27:03 +0000 (-0700) Subject: 3.11-stable patches X-Git-Tag: v3.0.95~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af52331132ad9e46b773119ded8ed44590d620b7;p=thirdparty%2Fkernel%2Fstable-queue.git 3.11-stable patches added patches: asoc-fsl-fix-module-build.patch imx-drm-imx-drm-core-export-imx_drm_encoder_get_mux_id.patch --- diff --git a/queue-3.11/asoc-fsl-fix-module-build.patch b/queue-3.11/asoc-fsl-fix-module-build.patch new file mode 100644 index 00000000000..892b17978ab --- /dev/null +++ b/queue-3.11/asoc-fsl-fix-module-build.patch @@ -0,0 +1,71 @@ +From 3f1a91aa25579ba5e7268a47a73d2a83e4802c62 Mon Sep 17 00:00:00 2001 +From: Fabio Estevam +Date: Mon, 29 Jul 2013 18:37:32 -0300 +Subject: ASoC: fsl: Fix module build + +From: Fabio Estevam + +commit 3f1a91aa25579ba5e7268a47a73d2a83e4802c62 upstream. + +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 +Signed-off-by: Fabio Estevam +Acked-by: Shawn Guo +Signed-off-by: Mark Brown +[Guenter Roeck: back-ported to 3.11] +Signed-off-by: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + +--- + 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 diff --git a/queue-3.11/imx-drm-imx-drm-core-export-imx_drm_encoder_get_mux_id.patch b/queue-3.11/imx-drm-imx-drm-core-export-imx_drm_encoder_get_mux_id.patch new file mode 100644 index 00000000000..c9e7eedf9c4 --- /dev/null +++ b/queue-3.11/imx-drm-imx-drm-core-export-imx_drm_encoder_get_mux_id.patch @@ -0,0 +1,36 @@ +From ea8d15832016b0d07a8121159904e6b1d21b5b8b Mon Sep 17 00:00:00 2001 +From: Fabio Estevam +Date: Fri, 28 Jun 2013 13:55:27 -0300 +Subject: imx-drm: imx-drm-core: Export imx_drm_encoder_get_mux_id + +From: Fabio Estevam + +commit ea8d15832016b0d07a8121159904e6b1d21b5b8b upstream. + +When building imx_v6_v7_defconfig with imx-drm drivers selected as modules, we +get the following build error: + +ERROR: "imx_drm_encoder_get_mux_id" [drivers/staging/imx-drm/imx-ldb.ko] undefined! + +Export the required function to avoid this problem. + +Signed-off-by: Fabio Estevam +Acked-by: Sascha Hauer +Acked-by: Philipp Zabel +Cc: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/staging/imx-drm/imx-drm-core.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/staging/imx-drm/imx-drm-core.c ++++ b/drivers/staging/imx-drm/imx-drm-core.c +@@ -678,6 +678,7 @@ found: + + return i; + } ++EXPORT_SYMBOL_GPL(imx_drm_encoder_get_mux_id); + + /* + * imx_drm_remove_encoder - remove an encoder diff --git a/queue-3.11/series b/queue-3.11/series index b02a73eae5b..6b61c54cfbb 100644 --- a/queue-3.11/series +++ b/queue-3.11/series @@ -9,3 +9,5 @@ hwmon-k10temp-add-support-for-fam16h-kabini.patch drivers-hv-vmbus-fix-a-bug-in-the-handling-of-channel-offers.patch acpi-ec-add-asustek-l4r-to-quirk-list-in-order-to-validate-ecdt.patch drivers-misc-hpilo-correct-panic-when-an-aux-ilo-is-detected.patch +asoc-fsl-fix-module-build.patch +imx-drm-imx-drm-core-export-imx_drm_encoder_get_mux_id.patch