kernel/4.3: update to version 4.3.3

[openwrt/openwrt.git] / target / linux / brcm2708 / modules.mk

diff --git a/target/linux/brcm2708/modules.mk b/target/linux/brcm2708/modules.mk
index 5c87c154cb353dedf34bdf936e32cd2e61825fc1..3bc592c94a813faa9f2b6176ee32bb4cee488017 100644 (file)
--- a/target/linux/brcm2708/modules.mk
+++ b/target/linux/brcm2708/modules.mk
@@ -28,6 +28,8 @@ $(eval $(call KernelPackage,sound-arm-bcm2835))
 define KernelPackage/sound-soc-bcm2708-i2s
   TITLE:=SoC Audio support for the Broadcom 2708 I2S module
   KCONFIG:= \
+       CONFIG_BCM2708_SPIDEV=n \
+       CONFIG_MFD_RPISENSE_CORE=n \
        CONFIG_SND_BCM2708_SOC_I2S \
        CONFIG_SND_SOC_DMAENGINE_PCM=y \
        CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
@@ -53,7 +55,7 @@ define KernelPackage/sound-soc-hifiberry-dac
        $(LINUX_DIR)/sound/soc/bcm/snd-soc-hifiberry-dac.ko \
        $(LINUX_DIR)/sound/soc/codecs/snd-soc-pcm5102a.ko
   AUTOLOAD:=$(call AutoLoad,68,snd-soc-pcm5102a snd-soc-hifiberry-dac)
-  DEPENDS:=kmod-sound-soc-bcm2708-i2s
+  DEPENDS:=kmod-sound-soc-bcm2708-i2s +kmod-i2c-bcm2708
   $(call AddDepends/sound)
 endef
 
@@ -64,20 +66,21 @@ endef
 $(eval $(call KernelPackage,sound-soc-hifiberry-dac))
 
 define KernelPackage/sound-soc-hifiberry-dacplus
-  TITLE:=Support for HifiBerry DAC+
+  TITLE:=Support for HifiBerry DAC+ / DAC+ Pro
   KCONFIG:= \
        CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS \
        CONFIG_SND_SOC_PCM512x
   FILES:= \
+       $(LINUX_DIR)/drivers/clk/clk-hifiberry-dacpro.ko \
        $(LINUX_DIR)/sound/soc/bcm/snd-soc-hifiberry-dacplus.ko \
        $(LINUX_DIR)/sound/soc/codecs/snd-soc-pcm512x.ko
-  AUTOLOAD:=$(call AutoLoad,68,snd-soc-pcm512x snd-soc-hifiberry-dacplus)
-  DEPENDS:=kmod-sound-soc-bcm2708-i2s
+  AUTOLOAD:=$(call AutoLoad,68,clk-hifiberry-dacpro snd-soc-pcm512x snd-soc-hifiberry-dacplus)
+  DEPENDS:=kmod-sound-soc-bcm2708-i2s +kmod-i2c-bcm2708
   $(call AddDepends/sound)
 endef
 
 define KernelPackage/sound-soc-hifiberry-dacplus/description
-  This package contains support for HifiBerry DAC+
+  This package contains support for HifiBerry DAC+ / DAC+ Pro
 endef
 
 $(eval $(call KernelPackage,sound-soc-hifiberry-dacplus))
@@ -91,7 +94,7 @@ define KernelPackage/sound-soc-hifiberry-digi
        $(LINUX_DIR)/sound/soc/bcm/snd-soc-hifiberry-digi.ko \
        $(LINUX_DIR)/sound/soc/codecs/snd-soc-wm8804.ko
   AUTOLOAD:=$(call AutoLoad,68,snd-soc-wm8804 snd-soc-hifiberry-digi)
-  DEPENDS:=kmod-sound-soc-bcm2708-i2s
+  DEPENDS:=kmod-sound-soc-bcm2708-i2s +kmod-i2c-bcm2708
   $(call AddDepends/sound)
 endef
 
@@ -110,7 +113,7 @@ define KernelPackage/sound-soc-hifiberry-amp
        $(LINUX_DIR)/sound/soc/bcm/snd-soc-hifiberry-amp.ko \
        $(LINUX_DIR)/sound/soc/codecs/snd-soc-tas5713.ko
   AUTOLOAD:=$(call AutoLoad,68,snd-soc-tas5713 snd-soc-hifiberry-amp)
-  DEPENDS:=kmod-sound-soc-bcm2708-i2s
+  DEPENDS:=kmod-sound-soc-bcm2708-i2s +kmod-i2c-bcm2708
   $(call AddDepends/sound)
 endef
 
@@ -129,7 +132,7 @@ define KernelPackage/sound-soc-rpi-dac
        $(LINUX_DIR)/sound/soc/bcm/snd-soc-rpi-dac.ko \
        $(LINUX_DIR)/sound/soc/codecs/snd-soc-pcm1794a.ko
   AUTOLOAD:=$(call AutoLoad,68,snd-soc-pcm1794a snd-soc-rpi-dac)
-  DEPENDS:=kmod-sound-soc-bcm2708-i2s
+  DEPENDS:=kmod-sound-soc-bcm2708-i2s +kmod-i2c-bcm2708
   $(call AddDepends/sound)
 endef
 
@@ -148,7 +151,7 @@ define KernelPackage/sound-soc-rpi-proto
        $(LINUX_DIR)/sound/soc/bcm/snd-soc-rpi-proto.ko \
        $(LINUX_DIR)/sound/soc/codecs/snd-soc-wm8731.ko
   AUTOLOAD:=$(call AutoLoad,68,snd-soc-wm8731 snd-soc-rpi-proto)
-  DEPENDS:=kmod-sound-soc-bcm2708-i2s
+  DEPENDS:=kmod-sound-soc-bcm2708-i2s +kmod-i2c-bcm2708
   $(call AddDepends/sound)
 endef
 
@@ -168,8 +171,8 @@ define KernelPackage/sound-soc-iqaudio-dac
        $(LINUX_DIR)/sound/soc/bcm/snd-soc-iqaudio-dac.ko \
        $(LINUX_DIR)/sound/soc/codecs/snd-soc-pcm512x.ko \
        $(LINUX_DIR)/sound/soc/codecs/snd-soc-pcm512x-i2c.ko
-  AUTOLOAD:=$(call AutoLoad,68,sound-soc-bcm2708-i2s snd-soc-pcm512x-i2c snd-soc-iqaudio-dac)
-  DEPENDS:=kmod-sound-soc-bcm2708-i2s
+  AUTOLOAD:=$(call AutoLoad,68,snd-soc-pcm512x snd-soc-pcm512x-i2c snd-soc-iqaudio-dac)
+  DEPENDS:=kmod-sound-soc-bcm2708-i2s +kmod-i2c-bcm2708
   $(call AddDepends/sound)
 endef
 
@@ -179,6 +182,29 @@ endef
 
 $(eval $(call KernelPackage,sound-soc-iqaudio-dac))
 
+define KernelPackage/sound-soc-raspidac3
+  TITLE:=Support for RaspiDAC Rev.3x
+  KCONFIG:= \
+       CONFIG_SND_BCM2708_SOC_RASPIDAC3 \
+       CONFIG_SND_SOC_PCM512x \
+       CONFIG_SND_SOC_PCM512x_I2C \
+       CONFIG_SND_SOC_TPA6130A2
+  FILES:= \
+       $(LINUX_DIR)/sound/soc/bcm/snd-soc-raspidac3.ko \
+       $(LINUX_DIR)/sound/soc/codecs/snd-soc-pcm512x.ko \
+       $(LINUX_DIR)/sound/soc/codecs/snd-soc-pcm512x-i2c.ko \
+       $(LINUX_DIR)/sound/soc/codecs/snd-soc-tpa6130a2.ko
+  AUTOLOAD:=$(call AutoLoad,68,snd-soc-pcm512x snd-soc-pcm512x-i2c snd-soc-tpa6130a2 snd-soc-raspidac3)
+  DEPENDS:=kmod-sound-soc-bcm2708-i2s +kmod-i2c-bcm2708
+  $(call AddDepends/sound)
+endef
+
+define KernelPackage/sound-soc-raspidac3/description
+  This package contains support for RaspiDAC Rev.3x
+endef
+
+$(eval $(call KernelPackage,sound-soc-raspidac3))
+
 
 define KernelPackage/random-bcm2708
   SUBMENU:=$(OTHER_MENU)
@@ -211,6 +237,40 @@ endef
 $(eval $(call KernelPackage,random-bcm2835))
 
 
+define KernelPackage/smi-bcm2835
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=BCM2835 SMI driver
+  KCONFIG:=CONFIG_BCM2835_SMI
+  FILES:=$(LINUX_DIR)/drivers/misc/bcm2835_smi.ko
+  AUTOLOAD:=$(call AutoLoad,20,bcm2835_smi)
+  DEPENDS:=@TARGET_brcm2708
+endef
+
+define KernelPackage/smi-bcm2835/description
+  This package contains the Character device driver for Broadcom Secondary
+  Memory Interface
+endef
+
+$(eval $(call KernelPackage,smi-bcm2835))
+
+define KernelPackage/smi-bcm2835-dev
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=BCM2835 SMI device driver
+  KCONFIG:=CONFIG_BCM2835_SMI_DEV
+  FILES:=$(LINUX_DIR)/drivers/char/broadcom/bcm2835_smi_dev.ko
+  AUTOLOAD:=$(call AutoLoad,21,bcm2835_smi_dev)
+  DEPENDS:=@TARGET_brcm2708 +kmod-smi-bcm2835
+endef
+
+define KernelPackage/smi-bcm2835-dev/description
+  This driver provides a character device interface (ioctl + read/write) to
+  Broadcom's Secondary Memory interface. The low-level functionality is provided
+  by the SMI driver itself.
+endef
+
+$(eval $(call KernelPackage,smi-bcm2835-dev))
+
+
 define KernelPackage/spi-bcm2708
   SUBMENU:=$(SPI_MENU)
   TITLE:=BCM2708 SPI controller driver
@@ -271,7 +331,9 @@ I2C_BCM2708_MODULES:=\
 define KernelPackage/i2c-bcm2708
   $(call i2c_defaults,$(I2C_BCM2708_MODULES),59)
   TITLE:=Broadcom BCM2708 I2C master controller driver
-  KCONFIG+= CONFIG_I2C_BCM2708_BAUDRATE=100000
+  KCONFIG+= \
+       CONFIG_I2C_BCM2708_BAUDRATE=100000 \
+       CONFIG_MFD_RPISENSE_CORE=n
   DEPENDS:=@TARGET_brcm2708 +kmod-i2c-core
 endef
 
@@ -287,6 +349,8 @@ I2C_BCM2835_MODULES:=\
 define KernelPackage/i2c-bcm2835
   $(call i2c_defaults,$(I2C_BCM2835_MODULES),59)
   TITLE:=Broadcom BCM2835 I2C master controller driver
+  KCONFIG+= \
+       CONFIG_MFD_RPISENSE_CORE=n
   DEPENDS:=@TARGET_brcm2708 +kmod-i2c-core
 endef