drop queue-5.17/asoc-intel-sof_es8336-add-a-quirk-for-huawei-mateboo.patch

diff --git a/queue-5.17/asoc-intel-sof_es8336-add-a-quirk-for-huawei-mateboo.patch b/queue-5.17/asoc-intel-sof_es8336-add-a-quirk-for-huawei-mateboo.patch
deleted file mode 100644 (file)
index 88d76a0..0000000
--- a/queue-5.17/asoc-intel-sof_es8336-add-a-quirk-for-huawei-mateboo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From e16a23e5cb743697d0aa0277cea4ee52b2ef6ee2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 7 Apr 2022 20:49:59 +0200
-Subject: ASoC: Intel: sof_es8336: Add a quirk for Huawei Matebook D15
-
-From: Mauro Carvalho Chehab <mchehab@kernel.org>
-
-[ Upstream commit c7cb4717f641db68e8117635bfcf62a9c27dc8d3 ]
-
-Based on experimental tests, Huawei Matebook D15 actually uses
-both gpio0 and gpio1: the first one controls the speaker, while
-the other one controls the headphone.
-
-Also, the headset is mapped as MIC1, instead of MIC2.
-
-So, add a quirk for it.
-
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
-Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Link: https://lore.kernel.org/r/d678aef9fc9a07aced611aa7cb8c9b800c649e5a.1649357263.git.mchehab@kernel.org
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/soc/intel/boards/sof_es8336.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c
-index 28d7670b8f8f..b18951a8f309 100644
---- a/sound/soc/intel/boards/sof_es8336.c
-+++ b/sound/soc/intel/boards/sof_es8336.c
-@@ -252,6 +252,15 @@ static const struct dmi_system_id sof_es8336_quirk_table[] = {
-                                       SOF_ES8336_TGL_GPIO_QUIRK |
-                                       SOF_ES8336_ENABLE_DMIC)
-       },
-+      {
-+              .callback = sof_es8336_quirk_cb,
-+              .matches = {
-+                      DMI_MATCH(DMI_SYS_VENDOR, "HUAWEI"),
-+                      DMI_MATCH(DMI_BOARD_NAME, "BOHB-WAX9-PCB-B2"),
-+              },
-+              .driver_data = (void *)(SOF_ES8336_HEADPHONE_GPIO |
-+                                      SOC_ES8336_HEADSET_MIC1)
-+      },
-       {}
- };
- 
--- 
-2.35.1
-

diff --git a/queue-5.17/series b/queue-5.17/series
index df977efc90e46f953d02f5a345186ce406d5f1a7..9f4e283ba51a72724cce8f7dcfa01742be4c29f1 100644 (file)
--- a/queue-5.17/series
+++ b/queue-5.17/series
@@ -159,7 +159,6 @@ asoc-cs35l41-fix-a-shift-out-of-bounds-warning-found.patch
 asoc-rt711-5682-check-if-bus-is-active-before-deferr.patch
 asoc-intel-soc-acpi-correct-device-endpoints-for-max.patch
 asoc-wm8731-disable-the-regulator-when-probing-fails.patch
-asoc-intel-sof_es8336-add-a-quirk-for-huawei-mateboo.patch
 input-cypress-sf-register-a-callback-to-disable-the-.patch
 ext4-fix-bug_on-in-start_this_handle-during-umount-f.patch
 arch-xtensa-platforms-fix-deadlock-in-rs_close.patch