From: Greg Kroah-Hartman Date: Fri, 25 Nov 2022 07:30:34 +0000 (+0100) Subject: drop queue-5.10/asoc-intel-sof_sdw-add-quirk-variant-for-lapbc710-nu.patch X-Git-Tag: v4.9.334~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e22e8d4689dc027364e752359ae6d9d5933deea;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.10/asoc-intel-sof_sdw-add-quirk-variant-for-lapbc710-nu.patch --- diff --git a/queue-5.10/asoc-intel-sof_sdw-add-quirk-variant-for-lapbc710-nu.patch b/queue-5.10/asoc-intel-sof_sdw-add-quirk-variant-for-lapbc710-nu.patch deleted file mode 100644 index e6be249a41b..00000000000 --- a/queue-5.10/asoc-intel-sof_sdw-add-quirk-variant-for-lapbc710-nu.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c663f9c076e3bb624e069b1b80616e7cc4deb40e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 17 Oct 2022 15:40:54 -0500 -Subject: ASoC: Intel: sof_sdw: add quirk variant for LAPBC710 NUC15 - -From: Pierre-Louis Bossart - -[ Upstream commit 41deb2db64997d01110faaf763bd911d490dfde7 ] - -Some NUC15 LAPBC710 devices don't expose the same DMI information as -the Intel reference, add additional entry in the match table. - -BugLink: https://github.com/thesofproject/linux/issues/3885 -Signed-off-by: Pierre-Louis Bossart -Reviewed-by: Ranjani Sridharan -Reviewed-by: Bard Liao -Link: https://lore.kernel.org/r/20221017204054.207512-1-pierre-louis.bossart@linux.intel.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/intel/boards/sof_sdw.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c -index 25548555d8d7..5e1a718a64da 100644 ---- a/sound/soc/intel/boards/sof_sdw.c -+++ b/sound/soc/intel/boards/sof_sdw.c -@@ -175,6 +175,17 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { - SOF_SDW_PCH_DMIC | - SOF_RT711_JD_SRC_JD2), - }, -+ { -+ /* NUC15 LAPBC710 skews */ -+ .callback = sof_sdw_quirk_cb, -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"), -+ DMI_MATCH(DMI_BOARD_NAME, "LAPBC710"), -+ }, -+ .driver_data = (void *)(SOF_SDW_TGL_HDMI | -+ SOF_SDW_PCH_DMIC | -+ RT711_JD1), -+ }, - /* TigerLake-SDCA devices */ - { - .callback = sof_sdw_quirk_cb, --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 016f676a6f5..885aa8070df 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -8,7 +8,6 @@ asoc-codecs-jz4725b-add-missed-line-in-power-control.patch asoc-codecs-jz4725b-fix-reported-volume-for-master-c.patch asoc-codecs-jz4725b-use-right-control-for-capture-vo.patch asoc-codecs-jz4725b-fix-capture-selector-naming.patch -asoc-intel-sof_sdw-add-quirk-variant-for-lapbc710-nu.patch selftests-futex-fix-build-for-clang.patch selftests-intel_pstate-fix-build-for-arch-x86_64.patch rtc-cmos-fix-build-on-non-acpi-platforms.patch