From: Greg Kroah-Hartman Date: Fri, 20 Dec 2024 09:48:44 +0000 (+0100) Subject: drop queue-5.10/asoc-intel-sof_sdw-add-quirks-for-some-new-dell-lapt.patch X-Git-Tag: v6.1.122~50 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57d08e3572ab2ce5c602ce48523b287688293d0f;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.10/asoc-intel-sof_sdw-add-quirks-for-some-new-dell-lapt.patch breaks the build --- diff --git a/queue-5.10/asoc-intel-sof_sdw-add-quirks-for-some-new-dell-lapt.patch b/queue-5.10/asoc-intel-sof_sdw-add-quirks-for-some-new-dell-lapt.patch deleted file mode 100644 index f6d3e1316f6..00000000000 --- a/queue-5.10/asoc-intel-sof_sdw-add-quirks-for-some-new-dell-lapt.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 65ba2936c65d6fac05e418d75f91dbca8817e05a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 28 Jul 2024 12:09:35 -0400 -Subject: ASoC: Intel: sof_sdw: Add quirks for some new Dell laptops - -From: Charles Keepax - -[ Upstream commit 91cdecaba791c74df6da0650e797fe1192cf2700 ] - -Add quirks for some new Dell laptops using Cirrus amplifiers in a bridge -configuration. - -Reviewed-by: Bard Liao -Signed-off-by: Charles Keepax -Signed-off-by: Pierre-Louis Bossart -Link: https://msgid.link/r/20240527193552.165567-11-pierre-louis.bossart@linux.intel.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/intel/boards/sof_sdw.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c -index 25bf73a7e7bf..ad3694d36d96 100644 ---- a/sound/soc/intel/boards/sof_sdw.c -+++ b/sound/soc/intel/boards/sof_sdw.c -@@ -234,6 +234,22 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { - }, - .driver_data = (void *)(RT711_JD2_100K), - }, -+ { -+ .callback = sof_sdw_quirk_cb, -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), -+ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0CE3") -+ }, -+ .driver_data = (void *)(SOF_SIDECAR_AMPS), -+ }, -+ { -+ .callback = sof_sdw_quirk_cb, -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), -+ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0CE4") -+ }, -+ .driver_data = (void *)(SOF_SIDECAR_AMPS), -+ }, - {} - }; - --- -2.39.5 - diff --git a/queue-5.10/series b/queue-5.10/series index 497fc9bbef7..efb00a7a7cf 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -1,5 +1,4 @@ net-sched-fix-ordering-of-qlen-adjustment.patch -asoc-intel-sof_sdw-add-quirks-for-some-new-dell-lapt.patch pci-aer-disable-aer-service-on-suspend.patch pci-use-preserve_config-in-place-of-pci_flags.patch mips-loongson64-dts-fix-msi-node-for-ls7a.patch