From: Paolo Pisati <paolo.pisati@canonical.com>
Date: Wed, 18 Aug 2021 13:56:43 +0000 (+0200)
Subject: Revert "UBUNTU: [Config] set CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC to y"
X-Git-Tag: Ubuntu-5.15.0-14.14~1848
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2184b97e92e2365f5ca3d2b7768e0e5886819c53;p=mirror_ubuntu-jammy-kernel.git

Revert "UBUNTU: [Config] set CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC to y"

This reverts commit 4030916582b50dc8cb2d9d09242e5970a4393973.

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 0776f52744d7..36b67880bd83 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8900,13 +8900,14 @@ CONFIG_SND_SOC_INTEL_CNL                        policy<{'amd64': 'n'}>
 CONFIG_SND_SOC_INTEL_CFL                        policy<{'amd64': 'n'}>
 CONFIG_SND_SOC_INTEL_CML_H                      policy<{'amd64': 'n'}>
 CONFIG_SND_SOC_INTEL_CML_LP                     policy<{'amd64': 'n'}>
-CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC      policy<{'amd64': 'y'}>
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC      policy<{'amd64': 'n'}>
 #
 CONFIG_SND_SOC_INTEL_SKYLAKE                    mark<ENFORCED> note<deprecated>
 CONFIG_SND_SOC_INTEL_CNL                        mark<ENFORCED> note<deprecated>
 CONFIG_SND_SOC_INTEL_CFL                        mark<ENFORCED> note<deprecated>
 CONFIG_SND_SOC_INTEL_CML_H                      mark<ENFORCED> note<deprecated>
 CONFIG_SND_SOC_INTEL_CML_LP                     mark<ENFORCED> note<deprecated>
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC      mark<ENFORCED> note<deprecated>
 
 # 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'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index b87b3ff92c5b..600972ff67cc 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -10076,7 +10076,7 @@ CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=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_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m