From 2e4795b45723de3d253f38bc57724d9512c737f5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 17 May 2023 10:28:32 +0200 Subject: [PATCH] drop queue-5.10/asoc-intel-sof_sdw-add-quirk-for-intel-rooks-county-.patch --- ...dw-add-quirk-for-intel-rooks-county-.patch | 52 ------------------- queue-5.10/series | 1 - 2 files changed, 53 deletions(-) delete mode 100644 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 index 503bceb5b61..00000000000 --- 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 -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 - -[ 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 -Reviewed-by: Pierre-Louis Bossart -Reviewed-by: Péter Ujfalusi -Signed-off-by: Bard Liao -Link: https://lore.kernel.org/r/20230314090553.498664-2-yung-chuan.liao@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 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 959f3d6c52c..f7183a48186 100644 --- 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 -- 2.47.3