diff options
| -rw-r--r-- | 0011-sound-soc-soc-dmaengine-pcm-Add-support-for-new-DMAE.patch | 8 | ||||
| -rw-r--r-- | arm-exynos-mp.patch | 4 | ||||
| -rw-r--r-- | arm-imx-fixsound.patch | 65 | ||||
| -rw-r--r-- | config-armv7 | 1 | ||||
| -rw-r--r-- | config-armv7-generic | 1 | ||||
| -rw-r--r-- | config-generic | 2 | ||||
| -rw-r--r-- | config-powerpc64 | 2 | ||||
| -rw-r--r-- | config-powerpc64p7 | 2 | ||||
| -rw-r--r-- | kernel.spec | 8 | ||||
| -rw-r--r-- | sources | 2 |
10 files changed, 19 insertions, 76 deletions
diff --git a/0011-sound-soc-soc-dmaengine-pcm-Add-support-for-new-DMAE.patch b/0011-sound-soc-soc-dmaengine-pcm-Add-support-for-new-DMAE.patch index f5f7ce88c..03e8927a1 100644 --- a/0011-sound-soc-soc-dmaengine-pcm-Add-support-for-new-DMAE.patch +++ b/0011-sound-soc-soc-dmaengine-pcm-Add-support-for-new-DMAE.patch @@ -12,13 +12,13 @@ helpers so that we can fetch and open channels using this method. Signed-off-by: Joel Fernandes <joelf@ti.com> --- - sound/soc/soc-dmaengine-pcm.c | 22 ++++++++++++++++++++++ + sound/core/pcm_dmaengine.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -diff --git a/sound/soc/soc-dmaengine-pcm.c b/sound/soc/soc-dmaengine-pcm.c +diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c index aa924d9..461fe4f 100644 ---- a/sound/soc/soc-dmaengine-pcm.c -+++ b/sound/soc/soc-dmaengine-pcm.c +--- a/sound/core/pcm_dmaengine.c ++++ b/sound/core/pcm_dmaengine.c @@ -276,6 +276,16 @@ struct dma_chan *snd_dmaengine_pcm_request_channel(dma_filter_fn filter_fn, } EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_request_channel); diff --git a/arm-exynos-mp.patch b/arm-exynos-mp.patch index 15667ab26..c0d17cddc 100644 --- a/arm-exynos-mp.patch +++ b/arm-exynos-mp.patch @@ -315,8 +315,8 @@ index 5a8ad51..03688dd 100644 config PINCTRL_EXYNOS bool "Pinctrl driver data for Samsung EXYNOS SoCs other than 5440" -- depends on OF && GPIOLIB && ARCH_EXYNOS -+ depends on OF && GPIOLIB && ARCH_EXYNOS_COMMON +- depends on OF && GPIOLIB && (ARCH_EXYNOS || ARCH_S5PV210) ++ depends on OF && GPIOLIB && (ARCH_EXYNOS_COMMON || ARCH_S5PV210) select PINCTRL_SAMSUNG config PINCTRL_EXYNOS5440 diff --git a/arm-imx-fixsound.patch b/arm-imx-fixsound.patch deleted file mode 100644 index cfad652e4..000000000 --- a/arm-imx-fixsound.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 3f1a91aa25579ba5e7268a47a73d2a83e4802c62 Mon Sep 17 00:00:00 2001 -From: Fabio Estevam <fabio.estevam@freescale.com> -Date: Mon, 29 Jul 2013 21:37:32 +0000 -Subject: 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> ---- -diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig -index 3a79d01..c26449b 100644 ---- 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 -diff --git a/sound/soc/fsl/imx-pcm.h b/sound/soc/fsl/imx-pcm.h -index 9136625..5d5b733 100644 ---- a/sound/soc/fsl/imx-pcm.h -+++ b/sound/soc/fsl/imx-pcm.h -@@ -32,7 +32,7 @@ - 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 @@ - } - #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 --- -cgit v0.9.2 diff --git a/config-armv7 b/config-armv7 index b703a7882..b1ee5d149 100644 --- a/config-armv7 +++ b/config-armv7 @@ -388,6 +388,7 @@ CONFIG_SND_SOC_IMX_PCM_DMA=m CONFIG_SND_SOC_IMX_SGTL5000=m CONFIG_SND_SOC_IMX_WM8962=m CONFIG_SND_SOC_IMX_MC13783=m +CONFIG_SND_SOC_IMX_SPDIF=m CONFIG_USB_EHCI_MXC=m CONFIG_USB_IMX21_HCD=m CONFIG_USB_MXS_PHY=m diff --git a/config-armv7-generic b/config-armv7-generic index f6b75582f..567a6248b 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -368,6 +368,7 @@ CONFIG_BMP085_SPI=m # Display CONFIG_CMA=y +CONFIG_DMA_CMA=y # CONFIG_CMA_DEBUG is not set CONFIG_CMA_SIZE_MBYTES=16 CONFIG_CMA_SIZE_SEL_MBYTES=y diff --git a/config-generic b/config-generic index 2d6092e4c..d64d6d3c7 100644 --- a/config-generic +++ b/config-generic @@ -200,6 +200,7 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_CMA is not set +# CONFIG_DMA_CMA is not set # CONFIG_SPI is not set @@ -2195,6 +2196,7 @@ CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m # CONFIG_TCG_INFINEON is not set # CONFIG_TCG_ST33_I2C is not set +# CONFIG_TCG_XEN is not set CONFIG_TELCLOCK=m # diff --git a/config-powerpc64 b/config-powerpc64 index 705a7ea2b..ae23e739b 100644 --- a/config-powerpc64 +++ b/config-powerpc64 @@ -134,6 +134,8 @@ CONFIG_RELOCATABLE=y CONFIG_RCU_FANOUT=64 +CONFIG_CMA=y +# CONFIG_CMA_DEBUG is not set CONFIG_KVM_BOOK3S_64=m CONFIG_KVM_BOOK3S_64_HV=y # CONFIG_KVM_EXIT_TIMING is not set diff --git a/config-powerpc64p7 b/config-powerpc64p7 index 7ab19187b..93ee2b276 100644 --- a/config-powerpc64p7 +++ b/config-powerpc64p7 @@ -125,6 +125,8 @@ CONFIG_RELOCATABLE=y CONFIG_RCU_FANOUT=64 +CONFIG_CMA=y +# CONFIG_CMA_DEBUG is not set CONFIG_KVM_BOOK3S_64=m CONFIG_KVM_BOOK3S_64_HV=y # CONFIG_KVM_EXIT_TIMING is not set diff --git a/kernel.spec b/kernel.spec index 2eb8e22b9..0ff22bf61 100644 --- a/kernel.spec +++ b/kernel.spec @@ -95,7 +95,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 10 +%define gitrev 11 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -715,8 +715,6 @@ Patch21020: arm-tegra-usb-no-reset-linux33.patch # ARM wandboard Patch21030: arm-wandboard-quad.patch -# https://git.kernel.org/cgit/linux/kernel/git/broonie/sound.git/patch/?id=3f1a91aa25579ba5e7268a47a73d2a83e4802c62 -Patch21031: arm-imx-fixsound.patch # AM33xx Patch21040: 0001-reset-Add-driver-for-gpio-controlled-reset-pins.patch @@ -1341,7 +1339,6 @@ ApplyPatch arm-highbank-for-3.12.patch ApplyPatch arm-omap-load-tfp410.patch ApplyPatch arm-tegra-usb-no-reset-linux33.patch ApplyPatch arm-wandboard-quad.patch -ApplyPatch arm-imx-fixsound.patch # Fix OMAP and AM33xx (BeagleBone) ApplyPatch 0001-reset-Add-driver-for-gpio-controlled-reset-pins.patch @@ -2314,6 +2311,9 @@ fi # ||----w | # || || %changelog +* Thu Sep 05 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git11.1 +- Linux v3.11-3891-gae7a835 + * Thu Sep 05 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git10.1 - Linux v3.11-3120-g816434e @@ -1,2 +1,2 @@ fea363551ff45fbe4cb88497b863b261 linux-3.11.tar.xz -13ccec0de87a7120ac2a4b18e063c367 patch-3.11-git10.xz +ae83dc4ffaba904f71be129a83d992b8 patch-3.11-git11.xz |