From: Greg Kroah-Hartman Date: Thu, 25 Nov 2021 06:27:16 +0000 (+0100) Subject: drop queue-5.10/asoc-intel-sof_sdw-add-missing-quirk-for-dell-sku-0a.patch X-Git-Tag: v5.15.5~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=844d52049a9218739c5816445f89d822f7079583;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.10/asoc-intel-sof_sdw-add-missing-quirk-for-dell-sku-0a.patch --- diff --git a/queue-5.10/asoc-intel-sof_sdw-add-missing-quirk-for-dell-sku-0a.patch b/queue-5.10/asoc-intel-sof_sdw-add-missing-quirk-for-dell-sku-0a.patch deleted file mode 100644 index d0c653814d5..00000000000 --- a/queue-5.10/asoc-intel-sof_sdw-add-missing-quirk-for-dell-sku-0a.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 3e4b711a9cbf3797c80562499e363e2ef9929879 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 4 Oct 2021 16:35:12 -0500 -Subject: ASoC: Intel: sof_sdw: add missing quirk for Dell SKU 0A45 - -From: Pierre-Louis Bossart - -[ Upstream commit 64ba6d2ce72ffde70dc5a1794917bf1573203716 ] - -This device is based on SDCA codecs but with a single amplifier -instead of two. - -BugLink: https://github.com/thesofproject/linux/issues/3161 -Signed-off-by: Pierre-Louis Bossart -Reviewed-by: Rander Wang -Reviewed-by: Bard Liao -Link: https://lore.kernel.org/r/20211004213512.220836-6-pierre-louis.bossart@linux.intel.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/intel/boards/sof_sdw.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c -index 25548555d8d79..d9b864856be19 100644 ---- a/sound/soc/intel/boards/sof_sdw.c -+++ b/sound/soc/intel/boards/sof_sdw.c -@@ -187,6 +187,16 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { - SOF_RT715_DAI_ID_FIX | - SOF_SDW_FOUR_SPK), - }, -+ { -+ .callback = sof_sdw_quirk_cb, -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), -+ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A45") -+ }, -+ .driver_data = (void *)(SOF_SDW_TGL_HDMI | -+ RT711_JD2 | -+ SOF_RT715_DAI_ID_FIX), -+ }, - /* AlderLake devices */ - { - .callback = sof_sdw_quirk_cb, --- -2.33.0 - diff --git a/queue-5.10/series b/queue-5.10/series index e5f45635af0..57fa25c0756 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -24,7 +24,6 @@ clk-imx-imx6ul-move-csi_sel-mux-to-correct-base-regi.patch asoc-nau8824-add-dmi-quirk-mechanism-for-active-high.patch scsi-advansys-fix-kernel-pointer-leak.patch alsa-intel-dsp-config-add-quirk-for-apl-glk-tgl-devi.patch -asoc-intel-sof_sdw-add-missing-quirk-for-dell-sku-0a.patch firmware_loader-fix-pre-allocated-buf-built-in-firmw.patch arm-dts-omap-fix-gpmc-mux-add-data-type.patch usb-host-ohci-tmio-check-return-value-after-calling-.patch