From d1eda7362073db6b8675e52e90449d3386bf373a Mon Sep 17 00:00:00 2001 From: John Audia Date: Sun, 21 Dec 2025 09:00:35 -0500 Subject: [PATCH] kernel: sound: 6.18: update module files This kernel reorganized HDA drivers into sound/hda/ subdirectories and split codec drivers into modular components. Core modules moved to sound/hda/{core,common,codecs,controllers}/ with version conditionals (@ge6.18/@lt6.18) added for backward compatibility. Codec drivers split into multiple modules: - Realtek: library + 10 chipset modules (ALC260-ALC882) - HDMI: base + 6 vendor modules (Intel, ATI, NVIDIA, etc.) - Cirrus: 3 chipset modules (CS420X, CS421X, CS8409) Signed-off-by: John Audia Link: https://github.com/openwrt/openwrt/pull/21078 Signed-off-by: Robert Marko --- package/kernel/linux/modules/sound.mk | 102 ++++++++++++++++++++------ 1 file changed, 79 insertions(+), 23 deletions(-) diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk index 4d77c7cd29..45a7d7e019 100644 --- a/package/kernel/linux/modules/sound.mk +++ b/package/kernel/linux/modules/sound.mk @@ -363,15 +363,19 @@ define KernelPackage/sound-hda-core TITLE:=HD Audio Sound Core Support KCONFIG:= \ CONFIG_SND_HDA_CORE \ + CONFIG_SND_HDA \ CONFIG_SND_HDA_HWDEP=y \ CONFIG_SND_HDA_RECONFIG=n \ CONFIG_SND_HDA_INPUT_BEEP=n \ CONFIG_SND_HDA_PATCH_LOADER=n \ CONFIG_SND_HDA_GENERIC FILES:= \ - $(LINUX_DIR)/sound/hda/snd-hda-core.ko \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-codec.ko \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-generic.ko + $(LINUX_DIR)/sound/hda/snd-hda-core.ko@lt6.18 \ + $(LINUX_DIR)/sound/pci/hda/snd-hda-codec.ko@lt6.18 \ + $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-generic.ko@lt6.18 \ + $(LINUX_DIR)/sound/hda/core/snd-hda-core.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/common/snd-hda-codec.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/snd-hda-codec-generic.ko@ge6.18 AUTOLOAD:=$(call AutoProbe,snd-hda-core snd-hda-codec snd-hda-codec-generic) $(call AddDepends/sound,+kmod-regmap-core) endef @@ -388,7 +392,8 @@ define KernelPackage/snd-hda-scodec-component KCONFIG:= \ CONFIG_SND_HDA_SCODEC_COMPONENT FILES:= \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-scodec-component.ko + $(LINUX_DIR)/sound/pci/hda/snd-hda-scodec-component.ko@lt6.18 \ + $(LINUX_DIR)/sound/hda/codecs/side-codecs/snd-hda-scodec-component.ko@ge6.18 AUTOLOAD:=$(call AutoProbe,snd-hda-scodec-component) $(call AddDepends/sound,kmod-sound-hda-core) endef @@ -399,10 +404,31 @@ define KernelPackage/sound-hda-codec-realtek SUBMENU:=$(SOUND_MENU) TITLE:= HD Audio Realtek Codec KCONFIG:= \ - CONFIG_SND_HDA_CODEC_REALTEK + CONFIG_SND_HDA_CODEC_REALTEK \ + CONFIG_SND_HDA_CODEC_ALC260=m \ + CONFIG_SND_HDA_CODEC_ALC262=m \ + CONFIG_SND_HDA_CODEC_ALC268=m \ + CONFIG_SND_HDA_CODEC_ALC269=m \ + CONFIG_SND_HDA_CODEC_ALC662=m \ + CONFIG_SND_HDA_CODEC_ALC680=m \ + CONFIG_SND_HDA_CODEC_ALC861=m \ + CONFIG_SND_HDA_CODEC_ALC861VD=m \ + CONFIG_SND_HDA_CODEC_ALC880=m \ + CONFIG_SND_HDA_CODEC_ALC882=m FILES:= \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-realtek.ko - AUTOLOAD:=$(call AutoProbe,snd-hda-codec-realtek) + $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-realtek.ko@lt6.18 \ + $(LINUX_DIR)/sound/hda/codecs/realtek/snd-hda-codec-realtek-lib.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/realtek/snd-hda-codec-alc260.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/realtek/snd-hda-codec-alc262.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/realtek/snd-hda-codec-alc268.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/realtek/snd-hda-codec-alc269.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/realtek/snd-hda-codec-alc662.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/realtek/snd-hda-codec-alc680.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/realtek/snd-hda-codec-alc861.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/realtek/snd-hda-codec-alc861vd.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/realtek/snd-hda-codec-alc880.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/realtek/snd-hda-codec-alc882.ko@ge6.18 + AUTOLOAD:=$(call AutoProbe,snd-hda-codec-realtek LINUX_6_18:snd-hda-codec-realtek-lib LINUX_6_18:snd-hda-codec-alc260 LINUX_6_18:snd-hda-codec-alc262 LINUX_6_18:snd-hda-codec-alc268 LINUX_6_18:snd-hda-codec-alc269 LINUX_6_18:snd-hda-codec-alc662 LINUX_6_18:snd-hda-codec-alc680 LINUX_6_18:snd-hda-codec-alc861 LINUX_6_18:snd-hda-codec-alc861vd LINUX_6_18:snd-hda-codec-alc880 LINUX_6_18:snd-hda-codec-alc882) $(call AddDepends/sound,kmod-sound-hda-core +kmod-snd-hda-scodec-component) endef @@ -418,7 +444,8 @@ define KernelPackage/sound-hda-codec-cmedia KCONFIG:= \ CONFIG_SND_HDA_CODEC_CMEDIA FILES:= \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-cmedia.ko + $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-cmedia.ko@lt6.18 \ + $(LINUX_DIR)/sound/hda/codecs/snd-hda-codec-cmedia.ko@ge6.18 AUTOLOAD:=$(call AutoProbe,snd-hda-codec-cmedia) $(call AddDepends/sound,kmod-sound-hda-core) endef @@ -435,7 +462,8 @@ define KernelPackage/sound-hda-codec-analog KCONFIG:= \ CONFIG_SND_HDA_CODEC_ANALOG FILES:= \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-analog.ko + $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-analog.ko@lt6.18 \ + $(LINUX_DIR)/sound/hda/codecs/snd-hda-codec-analog.ko@ge6.18 AUTOLOAD:=$(call AutoProbe,snd-hda-codec-analog) $(call AddDepends/sound,kmod-sound-hda-core) endef @@ -452,7 +480,8 @@ define KernelPackage/sound-hda-codec-idt KCONFIG:= \ CONFIG_SND_HDA_CODEC_SIGMATEL FILES:= \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-idt.ko + $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-idt.ko@lt6.18 \ + $(LINUX_DIR)/sound/hda/codecs/snd-hda-codec-idt.ko@ge6.18 AUTOLOAD:=$(call AutoProbe,snd-hda-codec-idt) $(call AddDepends/sound,kmod-sound-hda-core) endef @@ -469,7 +498,8 @@ define KernelPackage/sound-hda-codec-si3054 KCONFIG:= \ CONFIG_SND_HDA_CODEC_SI3054 FILES:= \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-si3054.ko + $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-si3054.ko@lt6.18 \ + $(LINUX_DIR)/sound/hda/codecs/snd-hda-codec-si3054.ko@ge6.18 AUTOLOAD:=$(call AutoProbe,snd-hda-codec-si3054) $(call AddDepends/sound,kmod-sound-hda-core) endef @@ -484,10 +514,16 @@ define KernelPackage/sound-hda-codec-cirrus SUBMENU:=$(SOUND_MENU) TITLE:=HD Audio Cirrus Logic Codec KCONFIG:= \ - CONFIG_SND_HDA_CODEC_CIRRUS + CONFIG_SND_HDA_CODEC_CIRRUS \ + CONFIG_SND_HDA_CODEC_CS420X=m \ + CONFIG_SND_HDA_CODEC_CS421X=m \ + CONFIG_SND_HDA_CODEC_CS8409=m FILES:= \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-cirrus.ko - AUTOLOAD:=$(call AutoProbe,snd-hda-codec-cirrus) + $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-cirrus.ko@lt6.18 \ + $(LINUX_DIR)/sound/hda/codecs/cirrus/snd-hda-codec-cs420x.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/cirrus/snd-hda-codec-cs421x.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/cirrus/snd-hda-codec-cs8409.ko@ge6.18 + AUTOLOAD:=$(call AutoProbe,snd-hda-codec-cirrus LINUX_6_18:snd-hda-codec-cs420x LINUX_6_18:snd-hda-codec-cs421x LINUX_6_18:snd-hda-codec-cs8409) $(call AddDepends/sound,kmod-sound-hda-core) endef @@ -503,7 +539,8 @@ define KernelPackage/sound-hda-codec-ca0110 KCONFIG:= \ CONFIG_SND_HDA_CODEC_CA0110 FILES:= \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-ca0110.ko + $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-ca0110.ko@lt6.18 \ + $(LINUX_DIR)/sound/hda/codecs/snd-hda-codec-ca0110.ko@ge6.18 AUTOLOAD:=$(call AutoProbe,snd-hda-codec-ca0110) $(call AddDepends/sound,kmod-sound-hda-core) endef @@ -521,7 +558,8 @@ define KernelPackage/sound-hda-codec-ca0132 CONFIG_SND_HDA_CODEC_CA0132 \ CONFIG_SND_HDA_CODEC_CA0132_DSP=n FILES:= \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-ca0132.ko + $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-ca0132.ko@lt6.18 \ + $(LINUX_DIR)/sound/hda/codecs/snd-hda-codec-ca0132.ko@ge6.18 AUTOLOAD:=$(call AutoProbe,snd-hda-codec-ca0132) $(call AddDepends/sound,kmod-sound-hda-core) endef @@ -538,7 +576,8 @@ define KernelPackage/sound-hda-codec-conexant KCONFIG:= \ CONFIG_SND_HDA_CODEC_CONEXANT FILES:= \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-conexant.ko + $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-conexant.ko@lt6.18 \ + $(LINUX_DIR)/sound/hda/codecs/snd-hda-codec-conexant.ko@ge6.18 AUTOLOAD:=$(call AutoProbe,snd-hda-codec-conexant) $(call AddDepends/sound,kmod-sound-hda-core) endef @@ -555,7 +594,8 @@ define KernelPackage/sound-hda-codec-via KCONFIG:= \ CONFIG_SND_HDA_CODEC_VIA FILES:= \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-via.ko + $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-via.ko@lt6.18 \ + $(LINUX_DIR)/sound/hda/codecs/snd-hda-codec-via.ko@ge6.18 AUTOLOAD:=$(call AutoProbe,snd-hda-codec-via) $(call AddDepends/sound,kmod-sound-hda-core) endef @@ -570,10 +610,24 @@ define KernelPackage/sound-hda-codec-hdmi SUBMENU:=$(SOUND_MENU) TITLE:=HD Audio HDMI/DisplayPort Codec KCONFIG:= \ - CONFIG_SND_HDA_CODEC_HDMI + CONFIG_SND_HDA_CODEC_HDMI \ + CONFIG_SND_HDA_CODEC_HDMI_GENERIC=m \ + CONFIG_SND_HDA_CODEC_HDMI_SIMPLE=m \ + CONFIG_SND_HDA_CODEC_HDMI_INTEL=m \ + CONFIG_SND_HDA_CODEC_HDMI_ATI=m \ + CONFIG_SND_HDA_CODEC_HDMI_NVIDIA=m \ + CONFIG_SND_HDA_CODEC_HDMI_NVIDIA_MCP=m \ + CONFIG_SND_HDA_CODEC_HDMI_TEGRA=m FILES:= \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-hdmi.ko - AUTOLOAD:=$(call AutoProbe,snd-hda-codec-hdmi) + $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-hdmi.ko@lt6.18 \ + $(LINUX_DIR)/sound/hda/codecs/hdmi/snd-hda-codec-hdmi.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/hdmi/snd-hda-codec-simplehdmi.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/hdmi/snd-hda-codec-intelhdmi.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/hdmi/snd-hda-codec-atihdmi.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/hdmi/snd-hda-codec-nvhdmi.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/hdmi/snd-hda-codec-nvhdmi-mcp.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/codecs/hdmi/snd-hda-codec-tegrahdmi.ko@ge6.18 + AUTOLOAD:=$(call AutoProbe,snd-hda-codec-hdmi LINUX_6_18:snd-hda-codec-simplehdmi LINUX_6_18:snd-hda-codec-intelhdmi LINUX_6_18:snd-hda-codec-atihdmi LINUX_6_18:snd-hda-codec-nvhdmi LINUX_6_18:snd-hda-codec-nvhdmi-mcp LINUX_6_18:snd-hda-codec-tegrahdmi) $(call AddDepends/sound,kmod-sound-hda-core) endef @@ -591,8 +645,10 @@ define KernelPackage/sound-hda-intel CONFIG_SOUND_PCI \ CONFIG_SND_HDA_INTEL FILES:= \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-intel.ko \ - $(LINUX_DIR)/sound/hda/snd-intel-dspcfg.ko + $(LINUX_DIR)/sound/pci/hda/snd-hda-intel.ko@lt6.18 \ + $(LINUX_DIR)/sound/hda/snd-intel-dspcfg.ko@lt6.18 \ + $(LINUX_DIR)/sound/hda/controllers/snd-hda-intel.ko@ge6.18 \ + $(LINUX_DIR)/sound/hda/core/snd-intel-dspcfg.ko@ge6.18 AUTOLOAD:=$(call AutoProbe,snd-hda-intel) $(call AddDepends/sound,kmod-sound-hda-core) endef