[SRU][OEM-B-OSP1][PATCH 1/1] UBUNTU: [Config] disable SND_SOC_INTEL_SKYLAKE

[Hui Wang]

BugLink: https://bugs.launchpad.net/bugs/1864061

If we don't disable it, this driver will be loaded to the kernel ahead
of sof-pci-dev.ko randomly since they all contains the same pciid,
this will break the sof driver. To avoid it, we need to blacklist this
driver manually.

>From kernel-5.4, this driver is disabled, and there is no users report
issues, so let's disable it in the osp1 kernel too.

According to Intel's comment, the soc_skl driver is replaced by sof
driver.

Signed-off-by: Hui Wang <hui.wang at canonical.com>
---
 debian.oem-osp1/abi/5.0.0-1039.44/amd64/oem-osp1.modules | 4 +---
 debian.oem-osp1/config/annotations                       | 6 ++++--
 debian.oem-osp1/config/config.common.ubuntu              | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian.oem-osp1/abi/5.0.0-1039.44/amd64/oem-osp1.modules b/debian.oem-osp1/abi/5.0.0-1039.44/amd64/oem-osp1.modules
index 75ad6907ac54..a629f4450235 100644
--- a/debian.oem-osp1/abi/5.0.0-1039.44/amd64/oem-osp1.modules
+++ b/debian.oem-osp1/abi/5.0.0-1039.44/amd64/oem-osp1.modules
@@ -4290,9 +4290,7 @@ snd-soc-sigmadsp-regmap
 snd-soc-simple-amplifier
 snd-soc-simple-card
 snd-soc-simple-card-utils
-snd-soc-skl
-snd-soc-skl-ipc
-snd-soc-skl-ssp-clk
+snd-soc-slk
 snd-soc-skl_hda_dsp
 snd-soc-skl_nau88l25_ssm4567
 snd-soc-skl_rt286
diff --git a/debian.oem-osp1/config/annotations b/debian.oem-osp1/config/annotations
index 8afd07793266..1920a3314e66 100644
--- a/debian.oem-osp1/config/annotations
+++ b/debian.oem-osp1/config/annotations
@@ -7662,14 +7662,16 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL               policy<{'amd64': 'y', 'i386': 'y
 CONFIG_SND_SOC_INTEL_HASWELL                    policy<{'amd64': 'm', 'i386': 'm'}>
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI          policy<{'amd64': 'm', 'i386': 'm'}>
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI         policy<{'amd64': 'm', 'i386': 'm'}>
-CONFIG_SND_SOC_INTEL_SKYLAKE                    policy<{'amd64': 'm', 'i386': 'm'}>
+CONFIG_SND_SOC_INTEL_SKYLAKE                    policy<{'amd64': 'n', 'i386': 'n'}>
+CONFIG_SND_SOC_INTEL_SKYLAKE                    mark<ENFORCED> note<LP:#1864061>
 CONFIG_SND_SOC_INTEL_SKL                        policy<{'amd64': 'm', 'i386': 'm'}>
 CONFIG_SND_SOC_INTEL_APL                        policy<{'amd64': 'm', 'i386': 'm'}>
 CONFIG_SND_SOC_INTEL_KBL                        policy<{'amd64': 'm', 'i386': 'm'}>
 CONFIG_SND_SOC_INTEL_GLK                        policy<{'amd64': 'm', 'i386': 'm'}>
 CONFIG_SND_SOC_INTEL_CNL                        policy<{'amd64': 'm', 'i386': 'm'}>
 CONFIG_SND_SOC_INTEL_CFL                        policy<{'amd64': 'm', 'i386': 'm'}>
-CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC      policy<{'amd64': 'y', 'i386': 'y'}>
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC      policy<{'amd64': 'n', 'i386': 'n'}>
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC      mark<ENFORCED> note<LP:#1864061>
 
 # 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'}>
diff --git a/debian.oem-osp1/config/config.common.ubuntu b/debian.oem-osp1/config/config.common.ubuntu
index 0b476b1023d0..920d603ac335 100644
--- a/debian.oem-osp1/config/config.common.ubuntu
+++ b/debian.oem-osp1/config/config.common.ubuntu
@@ -6808,10 +6808,10 @@ CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
-CONFIG_SND_SOC_INTEL_SKYLAKE=m
+# CONFIG_SND_SOC_INTEL_SKYLAKE is not set
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
-CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
+# CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC is not set
 CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
 CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC_INTEL_SST_ACPI=m
-- 
2.17.1