X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fmodules.mk;h=2bece6fc5c6831c4ff23a1daddf002fa7d74a08f;hb=e5060b32e5c662899971f450ea0983005e02ec57;hp=bfb9bcd826339771754911c108c8de326e351203;hpb=7295e9fb8be958913764eea2e6c467464dba4c41;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ramips/modules.mk b/target/linux/ramips/modules.mk
index bfb9bcd826..2bece6fc5c 100644
--- a/target/linux/ramips/modules.mk
+++ b/target/linux/ramips/modules.mk
@@ -1,11 +1,31 @@
 #
-# Copyright (C) 2006-2012 OpenWrt.org
+# Copyright (C) 2006-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 OTHER_MENU:=Other modules
+
+define KernelPackage/pwm-mediatek
+  SUBMENU:=Other modules
+  TITLE:=MT7628 PWM
+  DEPENDS:=@(TARGET_ramips_mt7628||TARGET_ramips_mt7688)
+  KCONFIG:= \
+	CONFIG_PWM=y \
+	CONFIG_PWM_MEDIATEK \
+	CONFIG_PWM_SYSFS=y
+  FILES:= \
+	$(LINUX_DIR)/drivers/pwm/pwm-mediatek.ko
+  AUTOLOAD:=$(call AutoProbe,pwm-mediatek)
+endef
+
+define KernelPackage/pwm-mediatek/description
+  Kernel modules for MediaTek Pulse Width Modulator
+endef
+
+$(eval $(call KernelPackage,pwm-mediatek))
+
 define KernelPackage/sdhci-mt7620
   SUBMENU:=Other modules
   TITLE:=MT7620 SDCI
@@ -27,7 +47,8 @@ I2C_RALINK_MODULES:= \
 define KernelPackage/i2c-ralink
   $(call i2c_defaults,$(I2C_RALINK_MODULES),59)
   TITLE:=Ralink I2C Controller
-  DEPENDS:=@TARGET_ramips @(!TARGET_ramips_mt7621) kmod-i2c-core
+  DEPENDS:=kmod-i2c-core @TARGET_ramips \
+	@!(TARGET_ramips_mt7621||TARGET_ramips_mt7628||TARGET_ramips_mt7688)
 endef
 
 define KernelPackage/i2c-ralink/description
@@ -40,63 +61,76 @@ $(eval $(call KernelPackage,i2c-ralink))
 I2C_MT7621_MODULES:= \
   CONFIG_I2C_MT7621:drivers/i2c/busses/i2c-mt7621
 
-define KernelPackage/i2c-mt7621
+define KernelPackage/i2c-mt7628
   $(call i2c_defaults,$(I2C_MT7621_MODULES),59)
-  TITLE:=MT7621 I2C Controller
-  DEPENDS:=@TARGET_ramips @TARGET_ramips_mt7621 kmod-i2c-core
+  TITLE:=MT7628/88 I2C Controller
+  DEPENDS:=kmod-i2c-core \
+	@(TARGET_ramips_mt7628||TARGET_ramips_mt7688)
 endef
 
-define KernelPackage/i2c-mt7621/description
+define KernelPackage/i2c-mt7628/description
  Kernel modules for enable mt7621 i2c controller.
 endef
 
-$(eval $(call KernelPackage,i2c-mt7621))
+$(eval $(call KernelPackage,i2c-mt7628))
+
+define KernelPackage/dma-ralink
+  SUBMENU:=Other modules
+  TITLE:=Ralink GDMA Engine
+  DEPENDS:=@TARGET_ramips
+  KCONFIG:= \
+	CONFIG_DMADEVICES=y \
+	CONFIG_DW_DMAC_PCI=n \
+	CONFIG_DMA_RALINK
+  FILES:= \
+	$(LINUX_DIR)/drivers/dma/virt-dma.ko \
+	$(LINUX_DIR)/drivers/dma/ralink-gdma.ko
+  AUTOLOAD:=$(call AutoLoad,52,ralink-gdma)
+endef
 
+define KernelPackage/dma-ralink/description
+ Kernel modules for enable ralink dma engine.
+endef
 
+$(eval $(call KernelPackage,dma-ralink))
 
-define KernelPackage/sound-mt7620
-  TITLE:=MT7620 PCM/I2S Alsa Driver
-  DEPENDS:=@TARGET_ramips_mt7620 +kmod-sound-soc-core +kmod-regmap @BROKEN
+define KernelPackage/hsdma-mtk
+  SUBMENU:=Other modules
+  TITLE:=MediaTek HSDMA Engine
+  DEPENDS:=@TARGET_ramips @TARGET_ramips_mt7621
   KCONFIG:= \
-	CONFIG_SND_MT7620_SOC_I2S \
-	CONFIG_SND_MT7620_SOC_WM8960
+	CONFIG_DMADEVICES=y \
+	CONFIG_DW_DMAC_PCI=n \
+	CONFIG_MTK_HSDMA
   FILES:= \
-	$(LINUX_DIR)/sound/soc/ralink/snd-soc-mt7620-i2s.ko \
-	$(LINUX_DIR)/sound/soc/ralink/snd-soc-mt7620-wm8960.ko \
-	$(LINUX_DIR)/sound/soc/codecs/snd-soc-wm8960.ko
-  AUTOLOAD:=$(call AutoLoad,90,snd-soc-wm8960 snd-soc-mt7620-i2s snd-soc-mt7620-wm8960)
-  $(call AddDepends/sound)
+	$(LINUX_DIR)/drivers/dma/virt-dma.ko \
+	$(LINUX_DIR)/drivers/dma/mtk-hsdma.ko
+  AUTOLOAD:=$(call AutoLoad,53,mtk-hsdma)
 endef
 
-define KernelPackage/sound-mt7620/description
- Alsa modules for ralink i2s controller.
+define KernelPackage/hsdma-mtk/description
+ Kernel modules for enable MediaTek hsdma engine.
 endef
 
-$(eval $(call KernelPackage,sound-mt7620))
-
+$(eval $(call KernelPackage,hsdma-mtk))
 
-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)
+define KernelPackage/sound-mt7620
+  TITLE:=MT7620 PCM/I2S Alsa Driver
+  DEPENDS:=@TARGET_ramips +kmod-sound-soc-core +kmod-regmap +kmod-dma-ralink @!TARGET_ramips_rt288x
   KCONFIG:= \
-	CONFIG_SND_MT76XX_SOC \
-	CONFIG_SND_MT76XX_I2S \
-	CONFIG_SND_MT76XX_PCM \
+	CONFIG_SND_RALINK_SOC_I2S \
+	CONFIG_SND_SIMPLE_CARD \
 	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/ralink/snd-soc-ralink-i2s.ko \
+	$(LINUX_DIR)/sound/soc/generic/snd-soc-simple-card.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 snd-soc-ralink-i2s snd-soc-simple-card)
   $(call AddDepends/sound)
 endef
 
-define KernelPackage/sound-mtk/description
+define KernelPackage/sound-mt7620/description
  Alsa modules for ralink i2s controller.
 endef
 
-$(eval $(call KernelPackage,sound-mtk))
+$(eval $(call KernelPackage,sound-mt7620))