drop queue-5.10/asoc-intel-sof_sdw-add-quirk-for-intel-rooks-county-.patch

diff --git a/queue-5.10/asoc-intel-sof_sdw-add-quirk-for-intel-rooks-county-.patch b/queue-5.10/asoc-intel-sof_sdw-add-quirk-for-intel-rooks-county-.patch
deleted file mode 100644 (file)
index 503bceb..0000000
--- a/queue-5.10/asoc-intel-sof_sdw-add-quirk-for-intel-rooks-county-.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 84d408ecee97b948a51cec6d8edd867d4ef7f885 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 14 Mar 2023 17:05:52 +0800
-Subject: ASOC: Intel: sof_sdw: add quirk for Intel 'Rooks County' NUC M15
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Eugene Huang <eugene.huang99@gmail.com>
-
-[ Upstream commit 3c728b1bc5b99c5275ac5c7788ef814c0e51ef54 ]
-
-Same quirks as the 'Bishop County' NUC M15, except the rt711 is in the
-'JD2 100K' jack detection mode.
-
-Link: https://github.com/thesofproject/linux/issues/4088
-Signed-off-by: Eugene Huang <eugene.huang99@gmail.com>
-Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
-Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
-Link: https://lore.kernel.org/r/20230314090553.498664-2-yung-chuan.liao@linux.intel.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 f5d8f7951cfc3..eb713e9c2bd22 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 'Rooks County' LAPRC510 and LAPRC710 skews */
-+              .callback = sof_sdw_quirk_cb,
-+              .matches = {
-+                      DMI_MATCH(DMI_SYS_VENDOR, "Intel(R) Client Systems"),
-+                      DMI_MATCH(DMI_PRODUCT_NAME, "LAPRC"),
-+              },
-+              .driver_data = (void *)(SOF_SDW_TGL_HDMI |
-+                                      SOF_SDW_PCH_DMIC |
-+                                      RT711_JD2_100K),
-+      },
-       /* TigerLake-SDCA devices */
-       {
-               .callback = sof_sdw_quirk_cb,
--- 
-2.39.2
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 959f3d6c52ca09c66008a26ad5daa2b095532385..f7183a48186ec6c4a46dd9045629649486b857e2 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -7,7 +7,6 @@ bluetooth-perform-careful-capability-checks-in-hci_sock_ioctl.patch
 x86-fpu-prevent-fpu-state-corruption.patch
 usb-serial-option-add-unisoc-vendor-and-tozed-lt70c-product.patch
 driver-core-don-t-require-dynamic_debug-for-initcall_debug-probe-timing.patch
-asoc-intel-sof_sdw-add-quirk-for-intel-rooks-county-.patch
 iio-adc-palmas_gpadc-fix-null-dereference-on-rmmod.patch
 asoc-intel-bytcr_rt5640-add-quirk-for-the-acer-iconi.patch
 asm-generic-io.h-suppress-endianness-warnings-for-re.patch