diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-05-27 15:12:04 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-05-28 10:36:27 +0200 |
commit | 584d4bf1d3c2265a810e1494eb5c8ef0a72ee934 (patch) | |
tree | 20b3364aee884d3f65f246c16ee7f8bd4a465ea2 /target/linux/bcm27xx/modules | |
parent | 9e467a764b4e30a04dd0431ea277f6acd26babe0 (diff) | |
download | upstream-584d4bf1d3c2265a810e1494eb5c8ef0a72ee934.tar.gz upstream-584d4bf1d3c2265a810e1494eb5c8ef0a72ee934.tar.bz2 upstream-584d4bf1d3c2265a810e1494eb5c8ef0a72ee934.zip |
bcm27xx: update patches from RPi foundation
bcm2708: boot tested on RPi B+ v1.2
bcm2709: boot tested on RPi 3B v1.2
bcm2710: boot tested on RPi 3B v1.2
bcm2711: boot tested on RPi 4B v1.1 4G
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/modules')
-rw-r--r-- | target/linux/bcm27xx/modules/sound.mk | 49 | ||||
-rw-r--r-- | target/linux/bcm27xx/modules/video.mk | 5 |
2 files changed, 52 insertions, 2 deletions
diff --git a/target/linux/bcm27xx/modules/sound.mk b/target/linux/bcm27xx/modules/sound.mk index 8d449a51fa..a4aeb629c3 100644 --- a/target/linux/bcm27xx/modules/sound.mk +++ b/target/linux/bcm27xx/modules/sound.mk @@ -268,6 +268,33 @@ endef $(eval $(call KernelPackage,sound-soc-allo-katana-codec)) +define KernelPackage/sound-soc-audioinjector-isolated-soundcard + TITLE:=Support for AudioInjector Isolated soundcard + KCONFIG:= \ + CONFIG_SND_AUDIOINJECTOR_ISOLATED_SOUNDCARD \ + CONFIG_SND_SOC_CS4271 \ + CONFIG_SND_SOC_CS4271_I2C + FILES:= \ + $(LINUX_DIR)/sound/soc/bcm/snd-soc-audioinjector-isolated-soundcard.ko \ + $(LINUX_DIR)/sound/soc/codecs/snd-soc-wm8731.ko + AUTOLOAD:=$(call AutoLoad,68,snd-soc-cs4271.o \ + snd-soc-cs4271-i2c \ + snd-soc-audioinjector-isolated-soundcard) + DEPENDS:= \ + kmod-sound-soc-bcm2835-i2s \ + +kmod-i2c-bcm2835 \ + +kmod-regmap-i2c \ + +kmod-regmap-spi + $(call AddDepends/sound) +endef + +define KernelPackage/sound-soc-audioinjector-isolated-soundcard/description + This package contains support for AudioInjector Isolated soundcard +endef + +$(eval $(call KernelPackage,sound-soc-audioinjector-isolated-soundcard)) + + define KernelPackage/sound-soc-audioinjector-octo-soundcard TITLE:=Support for AudioInjector Octo soundcard KCONFIG:= \ @@ -884,6 +911,28 @@ endef $(eval $(call KernelPackage,sound-soc-rpi-dac)) +define KernelPackage/sound-soc-merus-amp + TITLE:=Support for Infineon Merus Amp + KCONFIG:= \ + CONFIG_SND_SOC_MA120X0P + FILES:= \ + $(LINUX_DIR)/sound/soc/codecs/snd-soc-ma120x0p.ko + AUTOLOAD:=$(call AutoLoad,68,snd-soc-ma120x0p) + DEPENDS:= \ + kmod-sound-soc-bcm2835-i2s \ + +kmod-sound-soc-rpi-simple-soundcard \ + +kmod-i2c-bcm2835 \ + +kmod-regmap-i2c + $(call AddDepends/sound) +endef + +define KernelPackage/sound-soc-merus-amp/description + This package contains support for Infineon Merus Amp +endef + +$(eval $(call KernelPackage,sound-soc-merus-amp)) + + define KernelPackage/sound-soc-rpi-proto TITLE:=Support for RPi-PROTO KCONFIG:= \ diff --git a/target/linux/bcm27xx/modules/video.mk b/target/linux/bcm27xx/modules/video.mk index f1da7d8321..f7286cee3c 100644 --- a/target/linux/bcm27xx/modules/video.mk +++ b/target/linux/bcm27xx/modules/video.mk @@ -33,12 +33,13 @@ define KernelPackage/drm-vc4 +kmod-sound-soc-core KCONFIG:= \ CONFIG_DRM_VC4 \ - CONFIG_DRM_VC4_HDMI_CEC=n \ + CONFIG_DRM_VC4_HDMI_CEC=y \ CONFIG_DRM_V3D=n \ CONFIG_DRM_TVE200=n FILES:= \ $(LINUX_DIR)/drivers/gpu/drm/vc4/vc4.ko \ - $(LINUX_DIR)/drivers/gpu/drm/drm_kms_helper.ko + $(LINUX_DIR)/drivers/gpu/drm/drm_kms_helper.ko \ + $(LINUX_DIR)/drivers/media/cec/cec.ko AUTOLOAD:=$(call AutoProbe,vc4) endef |