X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm2708%2Fmodules.mk;h=04e6aa9233115b4e722334e3f1479944c550673b;hb=f78f271c1e2845ce60ac8236505e6baff2b31620;hp=68a7d38028df214c51b2f46bf2c87e7fa95b2845;hpb=b1be597a7aea2450093d0b386c7017775ea96e7a;p=librecmc%2Flibrecmc.git

diff --git a/target/linux/brcm2708/modules.mk b/target/linux/brcm2708/modules.mk
index 68a7d38028..04e6aa9233 100644
--- a/target/linux/brcm2708/modules.mk
+++ b/target/linux/brcm2708/modules.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2012-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -25,24 +25,24 @@ endef
 $(eval $(call KernelPackage,sound-arm-bcm2835))
 
 
-define KernelPackage/sound-soc-bcm2708-i2s
-  TITLE:=SoC Audio support for the Broadcom 2708 I2S module
+define KernelPackage/sound-soc-bcm2835-i2s
+  TITLE:=SoC Audio support for the Broadcom 2835 I2S module
   KCONFIG:= \
-	CONFIG_SND_BCM2708_SOC_I2S \
+	CONFIG_SND_BCM2835_SOC_I2S \
 	CONFIG_SND_SOC_DMAENGINE_PCM=y \
 	CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
   FILES:= \
-	$(LINUX_DIR)/sound/soc/bcm/snd-soc-bcm2708-i2s.ko
-  AUTOLOAD:=$(call AutoLoad,68,snd-soc-bcm2708-i2s)
+	$(LINUX_DIR)/sound/soc/bcm/snd-soc-bcm2835-i2s.ko
+  AUTOLOAD:=$(call AutoLoad,68,snd-soc-bcm2835-i2s)
   DEPENDS:=@TARGET_brcm2708 +kmod-regmap +kmod-sound-soc-core
   $(call AddDepends/sound)
 endef
 
-define KernelPackage/sound-soc-bcm2708-i2s/description
-  This package contains support for codecs attached to the Broadcom 2708 I2S interface
+define KernelPackage/sound-soc-bcm2835-i2s/description
+  This package contains support for codecs attached to the Broadcom 2835 I2S interface
 endef
 
-$(eval $(call KernelPackage,sound-soc-bcm2708-i2s))
+$(eval $(call KernelPackage,sound-soc-bcm2835-i2s))
 
 define KernelPackage/sound-soc-hifiberry-dac
   TITLE:=Support for HifiBerry DAC
@@ -53,7 +53,9 @@ 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-bcm2835-i2s \
+	+kmod-i2c-bcm2708
   $(call AddDepends/sound)
 endef
 
@@ -64,20 +66,23 @@ 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-bcm2835-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 +96,9 @@ 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-bcm2835-i2s \
+	+kmod-i2c-bcm2708
   $(call AddDepends/sound)
 endef
 
@@ -110,7 +117,9 @@ 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-bcm2835-i2s \
+	+kmod-i2c-bcm2708
   $(call AddDepends/sound)
 endef
 
@@ -129,7 +138,9 @@ 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-bcm2835-i2s \
+	+kmod-i2c-bcm2708
   $(call AddDepends/sound)
 endef
 
@@ -148,7 +159,9 @@ 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-bcm2835-i2s \
+	+kmod-i2c-bcm2708
   $(call AddDepends/sound)
 endef
 
@@ -169,7 +182,9 @@ define KernelPackage/sound-soc-iqaudio-dac
 	$(LINUX_DIR)/sound/soc/codecs/snd-soc-pcm512x.ko \
 	$(LINUX_DIR)/sound/soc/codecs/snd-soc-pcm512x-i2c.ko
   AUTOLOAD:=$(call AutoLoad,68,snd-soc-pcm512x snd-soc-pcm512x-i2c snd-soc-iqaudio-dac)
-  DEPENDS:=kmod-sound-soc-bcm2708-i2s
+  DEPENDS:= \
+	kmod-sound-soc-bcm2835-i2s \
+	+kmod-i2c-bcm2708
   $(call AddDepends/sound)
 endef
 
@@ -192,7 +207,9 @@ define KernelPackage/sound-soc-raspidac3
 	$(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
+  DEPENDS:= \
+	kmod-sound-soc-bcm2835-i2s \
+	+kmod-i2c-bcm2708
   $(call AddDepends/sound)
 endef
 
@@ -203,21 +220,6 @@ endef
 $(eval $(call KernelPackage,sound-soc-raspidac3))
 
 
-define KernelPackage/random-bcm2708
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=BCM2708 HW Random Number Generator
-  KCONFIG:=CONFIG_HW_RANDOM_BCM2708
-  FILES:=$(LINUX_DIR)/drivers/char/hw_random/bcm2708-rng.ko
-  AUTOLOAD:=$(call AutoLoad,11,bcm2708-rng)
-  DEPENDS:=@TARGET_brcm2708 +kmod-random-core
-endef
-
-define KernelPackage/random-bcm2708/description
-  This package contains the Broadcom 2708 HW random number generator driver
-endef
-
-$(eval $(call KernelPackage,random-bcm2708))
-
 define KernelPackage/random-bcm2835
   SUBMENU:=$(OTHER_MENU)
   TITLE:=BCM2835 HW Random Number Generator
@@ -234,30 +236,44 @@ endef
 $(eval $(call KernelPackage,random-bcm2835))
 
 
-define KernelPackage/spi-bcm2708
-  SUBMENU:=$(SPI_MENU)
-  TITLE:=BCM2708 SPI controller driver
-  KCONFIG:= \
-    CONFIG_BCM2708_SPIDEV=n \
-    CONFIG_SPI=y \
-    CONFIG_SPI_BCM2708 \
-    CONFIG_SPI_MASTER=y
-  FILES:=$(LINUX_DIR)/drivers/spi/spi-bcm2708.ko
-  AUTOLOAD:=$(call AutoLoad,89,spi-bcm2708)
+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/spi-bcm2708/description
-  This package contains the Broadcom 2708 SPI master controller driver
+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,spi-bcm2708))
+$(eval $(call KernelPackage,smi-bcm2835-dev))
+
 
 define KernelPackage/spi-bcm2835
   SUBMENU:=$(SPI_MENU)
   TITLE:=BCM2835 SPI controller driver
   KCONFIG:=\
-    CONFIG_BCM2708_SPIDEV=n \
     CONFIG_SPI=y \
     CONFIG_SPI_BCM2835 \
     CONFIG_SPI_MASTER=y
@@ -272,6 +288,24 @@ endef
 
 $(eval $(call KernelPackage,spi-bcm2835))
 
+define KernelPackage/spi-bcm2835-aux
+  SUBMENU:=$(SPI_MENU)
+  TITLE:=BCM2835 Aux SPI controller driver
+  KCONFIG:=\
+    CONFIG_SPI=y \
+    CONFIG_SPI_BCM2835AUX \
+    CONFIG_SPI_MASTER=y
+  FILES:=$(LINUX_DIR)/drivers/spi/spi-bcm2835aux.ko
+  AUTOLOAD:=$(call AutoLoad,89,spi-bcm2835aux)
+  DEPENDS:=@TARGET_brcm2708
+endef
+
+define KernelPackage/spi-bcm2835-aux/description
+  This package contains the Broadcom 2835 Aux SPI master controller driver
+endef
+
+$(eval $(call KernelPackage,spi-bcm2835-aux))
+
 
 define KernelPackage/hwmon-bcm2835
   TITLE:=BCM2835 HWMON driver
@@ -295,8 +329,7 @@ define KernelPackage/i2c-bcm2708
   $(call i2c_defaults,$(I2C_BCM2708_MODULES),59)
   TITLE:=Broadcom BCM2708 I2C master controller driver
   KCONFIG+= \
-	CONFIG_I2C_BCM2708_BAUDRATE=100000 \
-	CONFIG_MFD_RPISENSE_CORE=n
+	CONFIG_I2C_BCM2708_BAUDRATE=100000
   DEPENDS:=@TARGET_brcm2708 +kmod-i2c-core
 endef
 
@@ -312,8 +345,6 @@ 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