From 4224b52c3acc7203e7c2535d6806f30432dae5e3 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 17 Jan 2016 10:42:23 +0000 Subject: brcm2708: add linux 4.4 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - random-bcm2708 and spi-bcm2708 have been removed. - sound-soc-bcm2708-i2s has been upstreamed as sound-soc-bcm2835-i2s. Let's keep linux 4.1 for a while, since linux 4.4 appears to have some issues with multicast traffic on RPi ethernet: https://gist.github.com/Noltari/5b1cfdecce5ed4bc08fd Signed-off-by: Álvaro Fernández Rojas SVN-Revision: 48266 --- target/linux/brcm2708/modules.mk | 65 +++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 11 deletions(-) (limited to 'target/linux/brcm2708/modules.mk') diff --git a/target/linux/brcm2708/modules.mk b/target/linux/brcm2708/modules.mk index 3bc592c..4a00152 100644 --- a/target/linux/brcm2708/modules.mk +++ b/target/linux/brcm2708/modules.mk @@ -36,7 +36,7 @@ define KernelPackage/sound-soc-bcm2708-i2s FILES:= \ $(LINUX_DIR)/sound/soc/bcm/snd-soc-bcm2708-i2s.ko AUTOLOAD:=$(call AutoLoad,68,snd-soc-bcm2708-i2s) - DEPENDS:=@TARGET_brcm2708 +kmod-regmap +kmod-sound-soc-core + DEPENDS:=@TARGET_brcm2708 @LINUX_4_1 +kmod-regmap +kmod-sound-soc-core $(call AddDepends/sound) endef @@ -46,6 +46,25 @@ endef $(eval $(call KernelPackage,sound-soc-bcm2708-i2s)) +define KernelPackage/sound-soc-bcm2835-i2s + TITLE:=SoC Audio support for the Broadcom 2835 I2S module + KCONFIG:= \ + 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-bcm2835-i2s.ko + AUTOLOAD:=$(call AutoLoad,68,snd-soc-bcm2835-i2s) + DEPENDS:=@TARGET_brcm2708 @LINUX_4_4 +kmod-regmap +kmod-sound-soc-core + $(call AddDepends/sound) +endef + +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-bcm2835-i2s)) + define KernelPackage/sound-soc-hifiberry-dac TITLE:=Support for HifiBerry DAC KCONFIG:= \ @@ -55,7 +74,10 @@ 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 +kmod-i2c-bcm2708 + DEPENDS:= \ + LINUX_4_1:kmod-sound-soc-bcm2708-i2s \ + LINUX_4_4:kmod-sound-soc-bcm2835-i2s \ + +kmod-i2c-bcm2708 $(call AddDepends/sound) endef @@ -75,7 +97,10 @@ define KernelPackage/sound-soc-hifiberry-dacplus $(LINUX_DIR)/sound/soc/bcm/snd-soc-hifiberry-dacplus.ko \ $(LINUX_DIR)/sound/soc/codecs/snd-soc-pcm512x.ko AUTOLOAD:=$(call AutoLoad,68,clk-hifiberry-dacpro snd-soc-pcm512x snd-soc-hifiberry-dacplus) - DEPENDS:=kmod-sound-soc-bcm2708-i2s +kmod-i2c-bcm2708 + DEPENDS:= \ + LINUX_4_1:kmod-sound-soc-bcm2708-i2s \ + LINUX_4_4:kmod-sound-soc-bcm2835-i2s \ + +kmod-i2c-bcm2708 $(call AddDepends/sound) endef @@ -94,7 +119,10 @@ 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 +kmod-i2c-bcm2708 + DEPENDS:= \ + LINUX_4_1:kmod-sound-soc-bcm2708-i2s \ + LINUX_4_4:kmod-sound-soc-bcm2835-i2s \ + +kmod-i2c-bcm2708 $(call AddDepends/sound) endef @@ -113,7 +141,10 @@ 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 +kmod-i2c-bcm2708 + DEPENDS:= \ + LINUX_4_1:kmod-sound-soc-bcm2708-i2s \ + LINUX_4_4:kmod-sound-soc-bcm2835-i2s \ + +kmod-i2c-bcm2708 $(call AddDepends/sound) endef @@ -132,7 +163,10 @@ 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 +kmod-i2c-bcm2708 + DEPENDS:= \ + LINUX_4_1:kmod-sound-soc-bcm2708-i2s \ + LINUX_4_4:kmod-sound-soc-bcm2835-i2s \ + +kmod-i2c-bcm2708 $(call AddDepends/sound) endef @@ -151,7 +185,10 @@ 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 +kmod-i2c-bcm2708 + DEPENDS:= \ + LINUX_4_1:kmod-sound-soc-bcm2708-i2s \ + LINUX_4_4:kmod-sound-soc-bcm2835-i2s \ + +kmod-i2c-bcm2708 $(call AddDepends/sound) endef @@ -172,7 +209,10 @@ 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 +kmod-i2c-bcm2708 + DEPENDS:= \ + LINUX_4_1:kmod-sound-soc-bcm2708-i2s \ + LINUX_4_4:kmod-sound-soc-bcm2835-i2s \ + +kmod-i2c-bcm2708 $(call AddDepends/sound) endef @@ -195,7 +235,10 @@ 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 +kmod-i2c-bcm2708 + DEPENDS:= \ + LINUX_4_1:kmod-sound-soc-bcm2708-i2s \ + LINUX_4_4:kmod-sound-soc-bcm2835-i2s \ + +kmod-i2c-bcm2708 $(call AddDepends/sound) endef @@ -212,7 +255,7 @@ define KernelPackage/random-bcm2708 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 + DEPENDS:=@TARGET_brcm2708 @LINUX_4_1 +kmod-random-core endef define KernelPackage/random-bcm2708/description @@ -281,7 +324,7 @@ define KernelPackage/spi-bcm2708 CONFIG_SPI_MASTER=y FILES:=$(LINUX_DIR)/drivers/spi/spi-bcm2708.ko AUTOLOAD:=$(call AutoLoad,89,spi-bcm2708) - DEPENDS:=@TARGET_brcm2708 + DEPENDS:=@TARGET_brcm2708 @LINUX_4_1 endef define KernelPackage/spi-bcm2708/description -- cgit v1.1