kernel: add new core sound module snd-pcm-dmaengine.ko for 3.12 kernels and above

[openwrt.git] / package / kernel / linux / modules / sound.mk

diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk
index 52ce0ccc9233dda599955832c466c840c2a1a0e2..4e1a656dd2707286677786ec2485bce05787e4b6 100644 (file)
--- a/package/kernel/linux/modules/sound.mk
+++ b/package/kernel/linux/modules/sound.mk
@@ -40,6 +40,14 @@ SOUNDCORE_FILES += \
        $(LINUX_DIR)/sound/core/snd-compress.ko
 endif
 
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.12.0)),1)
+SOUNDCORE_LOAD += \
+       snd-pcm-dmaengine
+
+SOUNDCORE_FILES += \
+       $(LINUX_DIR)/sound/core/snd-pcm-dmaengine.ko
+endif
+
 define KernelPackage/sound-core
   SUBMENU:=$(SOUND_MENU)
   TITLE:=Sound support
@@ -183,13 +191,15 @@ $(eval $(call KernelPackage,sound-soc-ac97))
 define KernelPackage/sound-soc-imx
   TITLE:=IMX SoC support
   KCONFIG:=\
-               CONFIG_SND_IMX_SOC \
-               CONFIG_SND_SOC_IMX_AUDMUX \
-               CONFIG_SND_SOC_IMX_PCM
+       CONFIG_SND_IMX_SOC \
+       CONFIG_SND_SOC_IMX_AUDMUX \
+       CONFIG_SND_SOC_FSL_SSI \
+       CONFIG_SND_SOC_IMX_PCM
   FILES:= \
        $(LINUX_DIR)/sound/soc/fsl/snd-soc-imx-audmux.ko \
+       $(LINUX_DIR)/sound/soc/fsl/snd-soc-fsl-ssi.ko \
        $(LINUX_DIR)/sound/soc/fsl/snd-soc-imx-pcm.ko
-  AUTOLOAD:=$(call AutoLoad,56,snd-soc-imx)
+  AUTOLOAD:=$(call AutoLoad,56,snd-soc-imx-audmux snd-soc-fsl-ssi snd-soc-imx-pcm)
   DEPENDS:=@TARGET_imx6 +kmod-sound-soc-core
   $(call AddDepends/sound)
 endef
@@ -204,8 +214,10 @@ $(eval $(call KernelPackage,sound-soc-imx))
 define KernelPackage/sound-soc-imx-sgtl5000
   TITLE:=IMX SoC support for SGTL5000
   KCONFIG:=CONFIG_SND_SOC_IMX_SGTL5000
-  FILES:=$(LINUX_DIR)/sound/soc/codecs/snd-soc-sgtl5000.ko
-  AUTOLOAD:=$(call AutoLoad,57,snd-soc-sgtl5000)
+  FILES:=\
+       $(LINUX_DIR)/sound/soc/codecs/snd-soc-sgtl5000.ko \
+       $(LINUX_DIR)/sound/soc/fsl/snd-soc-imx-sgtl5000.ko
+  AUTOLOAD:=$(call AutoLoad,57,snd-soc-sgtl5000 snd-soc-imx-sgtl5000)
   DEPENDS:=@TARGET_imx6 +kmod-sound-soc-imx
   $(call AddDepends/sound)
 endef