From c34eab6fd12b4d91ec998b65f86245a3f7a600b4 Mon Sep 17 00:00:00 2001 From: Edmunt Pienkowsky Date: Thu, 15 Sep 2022 16:14:52 +0200 Subject: [PATCH] bcm27xx: sound-soc-justboom-*: fix packages Affected packages: sound-soc-justboom-both, sound-soc-justboom-dac and sound-soc-justboom-digi. - Add snd-soc-wm8804-i2c and/or snd-soc-pcm512x-i2c kernel modules. - Add kmod-regmap-i2c package dependency. Signed-off-by: Edmunt Pienkowsky --- target/linux/bcm27xx/modules/sound.mk | 37 ++++++++++++++++++--------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/target/linux/bcm27xx/modules/sound.mk b/target/linux/bcm27xx/modules/sound.mk index 21bac0ebf1..182d80a2c8 100644 --- a/target/linux/bcm27xx/modules/sound.mk +++ b/target/linux/bcm27xx/modules/sound.mk @@ -806,17 +806,23 @@ define KernelPackage/sound-soc-justboom-both KCONFIG:= \ CONFIG_SND_BCM2708_SOC_JUSTBOOM_BOTH \ CONFIG_SND_SOC_PCM512x \ - CONFIG_SND_SOC_WM8804 + CONFIG_SND_SOC_PCM512x_I2C \ + CONFIG_SND_SOC_WM8804 \ + CONFIG_SND_SOC_WM8804_I2C FILES:= \ $(LINUX_DIR)/sound/soc/bcm/snd-soc-justboom-both.ko \ $(LINUX_DIR)/sound/soc/codecs/snd-soc-pcm512x.ko \ - $(LINUX_DIR)/sound/soc/codecs/snd-soc-wm8804.ko - AUTOLOAD:=$(call AutoLoad,68,snd-soc-pcm512x snd-soc-wm8804 \ + $(LINUX_DIR)/sound/soc/codecs/snd-soc-pcm512x-i2c.ko \ + $(LINUX_DIR)/sound/soc/codecs/snd-soc-wm8804.ko \ + $(LINUX_DIR)/sound/soc/codecs/snd-soc-wm8804-i2c.ko + AUTOLOAD:=$(call AutoLoad,68,snd-soc-pcm512x-i2c snd-soc-pcm512x \ + snd-soc-wm8804-i2c snd-soc-wm8804 \ snd-soc-justboom-both) DEPENDS:= \ kmod-sound-soc-bcm2835-i2s \ +kmod-sound-soc-rpi-wm8804-soundcard \ - +kmod-i2c-bcm2835 + +kmod-i2c-bcm2835 \ + +kmod-regmap-i2c $(call AddDepends/sound) endef @@ -831,14 +837,18 @@ define KernelPackage/sound-soc-justboom-dac TITLE:=Support for JustBoom DAC KCONFIG:= \ CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC \ - CONFIG_SND_SOC_PCM512x + CONFIG_SND_SOC_PCM512x \ + CONFIG_SND_SOC_PCM512x_I2C FILES:= \ $(LINUX_DIR)/sound/soc/bcm/snd-soc-justboom-dac.ko \ - $(LINUX_DIR)/sound/soc/codecs/snd-soc-pcm512x.ko - AUTOLOAD:=$(call AutoLoad,68,snd-soc-pcm512x snd-soc-justboom-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-i2c snd-soc-pcm512x \ + snd-soc-justboom-dac) DEPENDS:= \ kmod-sound-soc-bcm2835-i2s \ - +kmod-i2c-bcm2835 + +kmod-i2c-bcm2835 \ + +kmod-regmap-i2c $(call AddDepends/sound) endef @@ -853,14 +863,17 @@ define KernelPackage/sound-soc-justboom-digi TITLE:=Support for JustBoom Digi KCONFIG:= \ CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI \ - CONFIG_SND_SOC_WM8804 + CONFIG_SND_SOC_WM8804 \ + CONFIG_SND_SOC_WM8804_I2C FILES:= \ - $(LINUX_DIR)/sound/soc/codecs/snd-soc-wm8804.ko - AUTOLOAD:=$(call AutoLoad,68,snd-soc-wm8804) + $(LINUX_DIR)/sound/soc/codecs/snd-soc-wm8804.ko \ + $(LINUX_DIR)/sound/soc/codecs/snd-soc-wm8804-i2c.ko + AUTOLOAD:=$(call AutoLoad,68,snd-soc-wm8804-i2c snd-soc-wm8804) DEPENDS:= \ kmod-sound-soc-bcm2835-i2s \ +kmod-sound-soc-rpi-wm8804-soundcard \ - +kmod-i2c-bcm2835 + +kmod-i2c-bcm2835 \ + +kmod-regmap-i2c $(call AddDepends/sound) endef -- 2.30.2