kernel: 5.10: update sound modules
authorTony Ambardar <itugrok@yahoo.com>
Wed, 17 Mar 2021 10:12:33 +0000 (03:12 -0700)
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Fri, 19 Mar 2021 14:02:47 +0000 (14:02 +0000)
Update file paths for kmod-sound-hda-intel and reflect new dependency of
kmod-sound-hda-core on kmod-ledtrig-audio.

Reported-by: Javier Marcet <javier@marcet.info>
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
package/kernel/linux/modules/sound.mk

index 66194a5a7349db263b5057ec8bff52314523bd85..2c11d078e16bb815dcb1058480bdfcf545202af3 100644 (file)
@@ -304,6 +304,10 @@ $(eval $(call KernelPackage,sound-dummy))
 define KernelPackage/sound-hda-core
   SUBMENU:=$(SOUND_MENU)
   TITLE:=HD Audio Sound Core Support
 define KernelPackage/sound-hda-core
   SUBMENU:=$(SOUND_MENU)
   TITLE:=HD Audio Sound Core Support
+  DEPENDS:= \
+       +LINUX_5_10&&PACKAGE_kmod-sound-hda-codec-realtek:kmod-ledtrig-audio \
+       +LINUX_5_10&&PACKAGE_kmod-sound-hda-codec-conexant:kmod-ledtrig-audio \
+       +LINUX_5_10&&PACKAGE_kmod-sound-hda-codec-idt:kmod-ledtrig-audio
   KCONFIG:= \
        CONFIG_SND_HDA_CORE \
        CONFIG_SND_HDA_HWDEP=y \
   KCONFIG:= \
        CONFIG_SND_HDA_CORE \
        CONFIG_SND_HDA_HWDEP=y \
@@ -522,7 +526,8 @@ define KernelPackage/sound-hda-intel
        CONFIG_SND_HDA_INTEL
   FILES:= \
        $(LINUX_DIR)/sound/pci/hda/snd-hda-intel.ko \
        CONFIG_SND_HDA_INTEL
   FILES:= \
        $(LINUX_DIR)/sound/pci/hda/snd-hda-intel.ko \
-       $(LINUX_DIR)/sound/hda/snd-intel-nhlt.ko
+       $(LINUX_DIR)/sound/hda/snd-intel-nhlt.ko@lt5.5 \
+       $(LINUX_DIR)/sound/hda/snd-intel-dspcfg.ko@ge5.5
   AUTOLOAD:=$(call AutoProbe,snd-hda-intel)
   $(call AddDepends/sound,kmod-sound-hda-core)
 endef
   AUTOLOAD:=$(call AutoProbe,snd-hda-intel)
   $(call AddDepends/sound,kmod-sound-hda-core)
 endef