summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-03-07 12:50:04 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-03-07 12:50:04 +0100
commit5df0a23377112ac7af0520767ded3116e06abeba (patch)
treea492439cd4d3f427c4bfde72cdbcb88929bb3bd1
parent566397b4f43531761e66f373153cea94a15d22c2 (diff)
parent0d16125ca839eed895d0798ce489047435f8ebda (diff)
downloadkernel-5df0a23377112ac7af0520767ded3116e06abeba.tar.gz
kernel-5df0a23377112ac7af0520767ded3116e06abeba.tar.xz
kernel-5df0a23377112ac7af0520767ded3116e06abeba.zip
Merge remote-tracking branch 'origin/f33' into f33-user-thl-vanilla-fedora
-rw-r--r--configs/fedora/generic/x86/CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT2
-rw-r--r--kernel-i686-debug-fedora.config2
-rw-r--r--kernel-i686-fedora.config2
-rw-r--r--kernel-x86_64-debug-fedora.config2
-rw-r--r--kernel-x86_64-fedora.config2
-rw-r--r--kernel.spec3
6 files changed, 8 insertions, 5 deletions
diff --git a/configs/fedora/generic/x86/CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT b/configs/fedora/generic/x86/CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT
index f3afefecc..bc9066b89 100644
--- a/configs/fedora/generic/x86/CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT
+++ b/configs/fedora/generic/x86/CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT
@@ -1 +1 @@
-CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
+# CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT is not set
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 422d5fc9e..e7cc8c1f8 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -5950,7 +5950,7 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
CONFIG_SND_SOC_SOF_ACPI=m
CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
-CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
+# CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT is not set
CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y
CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
CONFIG_SND_SOC_SOF_COMETLAKE_H_SUPPORT=y
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 712bd8a70..ebe9ebcd4 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -5930,7 +5930,7 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
CONFIG_SND_SOC_SOF_ACPI=m
CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
-CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
+# CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT is not set
CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y
CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
CONFIG_SND_SOC_SOF_COMETLAKE_H_SUPPORT=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 48dd0ee7f..e073d0934 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -6001,7 +6001,7 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
CONFIG_SND_SOC_SOF_ACPI=m
CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
-CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
+# CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT is not set
CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y
CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
CONFIG_SND_SOC_SOF_COMETLAKE_H_SUPPORT=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 0707ea8e8..c43a5608e 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -5981,7 +5981,7 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
CONFIG_SND_SOC_SOF_ACPI=m
CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
-CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
+# CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT is not set
CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y
CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
CONFIG_SND_SOC_SOF_COMETLAKE_H_SUPPORT=y
diff --git a/kernel.spec b/kernel.spec
index 6ca174fba..180e2fcb4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2986,6 +2986,9 @@ fi
#
#
%changelog
+* Thu Mar 04 2021 Hans de Goede <hdegoede@redhat.com>
+- Fix broadwell-rt286 sound (rhbz#1933229)
+
* Thu Mar 04 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.20-200
- Linux v5.10.20