From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 18 Jan 2016 13:22:34 +0000 (+0000)
Subject: ramips: fix kernel config handling for mt7620/mt7628 sound module
X-Git-Tag: reboot~811
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fa61e3fbba6bbb936ae381389d2968c8b75c4424;p=openwrt%2Fstaging%2Fnoltari.git

ramips: fix kernel config handling for mt7620/mt7628 sound module

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48316
---

diff --git a/target/linux/ramips/modules.mk b/target/linux/ramips/modules.mk
index bfb9bcd826..66a7f68145 100644
--- a/target/linux/ramips/modules.mk
+++ b/target/linux/ramips/modules.mk
@@ -75,23 +75,54 @@ endef
 $(eval $(call KernelPackage,sound-mt7620))
 
 
+define KernelPackage/sound-mtk-mt7620
+  TITLE:=Mediatek I2S Alsa Driver (MT7620)
+  HIDDEN:=1
+  KCONFIG:= \
+	CONFIG_SND_MT76XX_SOC \
+	CONFIG_SND_MT76XX_SOC_MT7620=y \
+	CONFIG_SND_MT76XX_SOC_MT7628=n
+  FILES:= \
+	$(LINUX_DIR)/sound/soc/mtk/ralink_gdma.ko
+  AUTOLOAD:=$(call AutoLoad,90,ralink_gdma)
+  $(call AddDepends/sound)
+endef
+$(eval $(call KernelPackage,sound-mtk-mt7620))
+
+define KernelPackage/sound-mtk-mt7628
+  TITLE:=Mediatek I2S Alsa Driver (MT7628)
+  HIDDEN:=1
+  KCONFIG:= \
+	CONFIG_SND_MT76XX_SOC \
+	CONFIG_SND_MT76XX_SOC_MT7620=n \
+	CONFIG_SND_MT76XX_SOC_MT7628=y
+  FILES:= \
+	$(LINUX_DIR)/sound/soc/mtk/ralink_gdma.ko
+  AUTOLOAD:=$(call AutoLoad,90,ralink_gdma)
+  $(call AddDepends/sound)
+endef
+$(eval $(call KernelPackage,sound-mtk-mt7628))
+
 define KernelPackage/sound-mtk
   TITLE:=Mediatek I2S Alsa Driver
-  DEPENDS:= +kmod-sound-soc-core +kmod-regmap +kmod-i2c-ralink @(TARGET_ramips_mt7628||TARGET_ramips_mt7688||TARGET_ramips_mt7620)
+  DEPENDS:= \
+	+kmod-sound-soc-core +kmod-regmap +kmod-i2c-ralink \
+	@(TARGET_ramips_mt7628||TARGET_ramips_mt7688||TARGET_ramips_mt7620) \
+	+TARGET_ramips_mt7620:kmod-sound-mtk-mt7620 \
+	+TARGET_ramips_mt7628:kmod-sound-mtk-mt7628 \
+	+TARGET_ramips_mt7688:kmod-sound-mtk-mt7628
   KCONFIG:= \
-	CONFIG_SND_MT76XX_SOC \
 	CONFIG_SND_MT76XX_I2S \
 	CONFIG_SND_MT76XX_PCM \
 	CONFIG_SND_SOC_WM8960
   FILES:= \
-	$(LINUX_DIR)/sound/soc/mtk/ralink_gdma.ko \
 	$(LINUX_DIR)/sound/soc/mtk/snd-soc-mt76xx-i2s-ctl.ko \
 	$(LINUX_DIR)/sound/soc/mtk/snd-soc-mt76xx-i2s.ko \
 	$(LINUX_DIR)/sound/soc/mtk/snd-soc-mt76xx-pcm.ko \
 	$(LINUX_DIR)/sound/soc/mtk/snd-soc-mt76xx-machine.ko \
 	$(LINUX_DIR)/sound/soc/mtk/i2c_wm8960.ko \
 	$(LINUX_DIR)/sound/soc/codecs/snd-soc-wm8960.ko
-  AUTOLOAD:=$(call AutoLoad,90,ralink_gdma snd-soc-wm8960 i2c_wm8960 snd-soc-mt76xx-i2s-ctl snd-soc-mt76xx-i2s snd-soc-mt76xx-pcm snd-soc-mt76xx-machine)
+  AUTOLOAD:=$(call AutoLoad,90,snd-soc-wm8960 i2c_wm8960 snd-soc-mt76xx-i2s-ctl snd-soc-mt76xx-i2s snd-soc-mt76xx-pcm snd-soc-mt76xx-machine)
   $(call AddDepends/sound)
 endef