UBUNTU: [Config] Enable SOF_HDA link and codec

BugLink: https://bugs.launchpad.net/bugs/1848490
The Eoan kernel already has alsa/sof driver, we need to enable SOF_HDA
link and codec, otherwise the dmic can't work on the Dell and Lenovo
machines which have the dmic directly connected to PCH.

Because the SOF_HDA depneds on the NOCODEC=n, we need to disable
SOF_NOCODEC.

Signed-off-by: Hui Wang <hui.wang@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
[ klebers:
  - adjusted configs after running 'updateconfigs'
  - updated the annotations file
  - removed 'snd-sof-nocodec' from previous ABI module list. ]
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/debian.master/abi/5.3.0-19.20/amd64/generic.modules b/debian.master/abi/5.3.0-19.20/amd64/generic.modules
index 1ca5e593fac7a871a3906e50b75967d70a015990..c74a1f1df05358659c92297bee7f1416c50cf4a4 100644 (file)
--- a/debian.master/abi/5.3.0-19.20/amd64/generic.modules
+++ b/debian.master/abi/5.3.0-19.20/amd64/generic.modules
@@ -4473,7 +4473,6 @@ snd-sof-intel-bdw
 snd-sof-intel-byt
 snd-sof-intel-hda-common
 snd-sof-intel-ipc
-snd-sof-nocodec
 snd-sof-xtensa-dsp
 snd-sonicvibes
 snd-timer

diff --git a/debian.master/abi/5.3.0-19.20/amd64/lowlatency.modules b/debian.master/abi/5.3.0-19.20/amd64/lowlatency.modules
index f21239c5a139b7be3c172f4334e32c2d584fe70e..105a73ea6ca012c49753ccc15d129cc784b24e32 100644 (file)
--- a/debian.master/abi/5.3.0-19.20/amd64/lowlatency.modules
+++ b/debian.master/abi/5.3.0-19.20/amd64/lowlatency.modules
@@ -4474,7 +4474,6 @@ snd-sof-intel-bdw
 snd-sof-intel-byt
 snd-sof-intel-hda-common
 snd-sof-intel-ipc
-snd-sof-nocodec
 snd-sof-xtensa-dsp
 snd-sonicvibes
 snd-timer

diff --git a/debian.master/abi/5.3.0-19.20/arm64/generic.modules b/debian.master/abi/5.3.0-19.20/arm64/generic.modules
index ba981342b6058fede7cfd924f6b3be48cbc8028b..896ba5534ec610f1fea58b5de5c099c5ad367acc 100644 (file)
--- a/debian.master/abi/5.3.0-19.20/arm64/generic.modules
+++ b/debian.master/abi/5.3.0-19.20/arm64/generic.modules
@@ -4839,7 +4839,6 @@ snd-soc-xlnx-spdif
 snd-soc-xtfpga-i2s
 snd-soc-zx-aud96p22
 snd-sof
-snd-sof-nocodec
 snd-timer
 snd-ua101
 snd-usb-6fire

diff --git a/debian.master/abi/5.3.0-19.20/arm64/snapdragon.modules b/debian.master/abi/5.3.0-19.20/arm64/snapdragon.modules
index d1bc473e632615df1a2d0dee1b301c61153ce5fd..776f57d1978924b9c07508e1afba6b105cb99ea9 100644 (file)
--- a/debian.master/abi/5.3.0-19.20/arm64/snapdragon.modules
+++ b/debian.master/abi/5.3.0-19.20/arm64/snapdragon.modules
@@ -4762,7 +4762,6 @@ snd-soc-xlnx-spdif
 snd-soc-xtfpga-i2s
 snd-soc-zx-aud96p22
 snd-sof
-snd-sof-nocodec
 snd-timer
 snd-ua101
 snd-usb-6fire

diff --git a/debian.master/abi/5.3.0-19.20/armhf/generic-lpae.modules b/debian.master/abi/5.3.0-19.20/armhf/generic-lpae.modules
index d4b648005d959a35f07faf0f7f05b34a959b0a56..0595d12062df88eb0f27443fe0fd77ca85da48c7 100644 (file)
--- a/debian.master/abi/5.3.0-19.20/armhf/generic-lpae.modules
+++ b/debian.master/abi/5.3.0-19.20/armhf/generic-lpae.modules
@@ -4769,7 +4769,6 @@ snd-soc-xlnx-spdif
 snd-soc-xtfpga-i2s
 snd-soc-zx-aud96p22
 snd-sof
-snd-sof-nocodec
 snd-sonicvibes
 snd-trident
 snd-ua101

diff --git a/debian.master/abi/5.3.0-19.20/armhf/generic.modules b/debian.master/abi/5.3.0-19.20/armhf/generic.modules
index 1297f7dd929fd955b049318d4e3277b25fd1a904..f8ebb046c12e19b4668a4f53624012879ba24d41 100644 (file)
--- a/debian.master/abi/5.3.0-19.20/armhf/generic.modules
+++ b/debian.master/abi/5.3.0-19.20/armhf/generic.modules
@@ -4876,7 +4876,6 @@ snd-soc-xlnx-spdif
 snd-soc-xtfpga-i2s
 snd-soc-zx-aud96p22
 snd-sof
-snd-sof-nocodec
 snd-ua101
 snd-usb-6fire
 snd-usb-audio

diff --git a/debian.master/abi/5.3.0-19.20/ppc64el/generic.modules b/debian.master/abi/5.3.0-19.20/ppc64el/generic.modules
index 6e2d78047c6d025ae404965e691c36d00bbe7e7a..6063ba986119232af7e8492f22c977f3f97ab36e 100644 (file)
--- a/debian.master/abi/5.3.0-19.20/ppc64el/generic.modules
+++ b/debian.master/abi/5.3.0-19.20/ppc64el/generic.modules
@@ -4226,7 +4226,6 @@ snd-soc-xlnx-spdif
 snd-soc-xtfpga-i2s
 snd-soc-zx-aud96p22
 snd-sof
-snd-sof-nocodec
 snd-timer
 snd-ua101
 snd-usb-6fire

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 2874f5a68d2913c30f20707dded1b03836f65e10..039ab07032c64323470538bcb43b186757334eae 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -7917,6 +7917,11 @@ CONFIG_SND_SOC_INTEL_CFL                        policy<{'amd64': 'm', 'i386': 'm
 CONFIG_SND_SOC_INTEL_CML_H                      policy<{'amd64': 'm', 'i386': 'm'}>
 CONFIG_SND_SOC_INTEL_CML_LP                     policy<{'amd64': 'm', 'i386': 'm'}>
 CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC      policy<{'amd64': 'y', 'i386': 'y'}>
+CONFIG_SND_SOC_SOF_HDA_LINK                     mark<ENFORCED> note<LP:#1848490>
+CONFIG_SND_SOC_SOF_HDA_LINK                     policy<{'amd64': 'y', 'i386': 'y'}>
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC              mark<ENFORCED> note<LP:#1848490>
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC              policy<{'amd64': 'y', 'i386': 'y'}>
+
 
 # Menu: Device Drivers >> Sound card support >> Advanced Linux Sound Architecture >> ALSA for SoC audio support >> Intel ASoC SST drivers >> Intel Machine drivers
 CONFIG_SND_SOC_INTEL_MACH                       policy<{'amd64': 'y', 'i386': 'y'}>
@@ -8012,7 +8017,8 @@ CONFIG_SND_SOC_RCAR                             policy<{'arm64': 'm', 'armhf': '
 CONFIG_SND_SOC_SOF_TOPLEVEL                     policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
 CONFIG_SND_SOC_SOF_PCI                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_SND_SOC_SOF_ACPI                         policy<{'amd64': 'm', 'arm64': 'm', 'i386': 'm'}>
-CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
+CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT              mark<ENFORCED> note<LP:#1848490>
+CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT              policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
 CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
 
 # Menu: Device Drivers >> Sound card support >> Advanced Linux Sound Architecture >> ALSA for SoC audio support >> Sound Open Firmware Support >> SOF debugging features

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index fff3516eeb40b6707152317705a5a1e30046bd47..309f564ca6efd0d5f1c11c513ef38d64fba72225 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -9248,7 +9248,10 @@ CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT=y
 # CONFIG_SND_SOC_SOF_DEBUG is not set
 CONFIG_SND_SOC_SOF_GEMINILAKE=m
 CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_HDA=m
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
 CONFIG_SND_SOC_SOF_HDA_COMMON=m
+CONFIG_SND_SOC_SOF_HDA_LINK=y
 CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
 CONFIG_SND_SOC_SOF_ICELAKE=m
 CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
@@ -9260,10 +9263,10 @@ CONFIG_SND_SOC_SOF_INTEL_PCI=m
 CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_MERRIFIELD=m
 CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
-CONFIG_SND_SOC_SOF_NOCODEC=m
-CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT=y
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
 CONFIG_SND_SOC_SOF_OPTIONS=m
 CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
 # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_XTENSA=m