drop duplicate 5.4 commit

diff --git a/queue-5.4/asoc-intel-bytcr_rt5640-add-quirk-for-the-advantech-.patch-10536 b/queue-5.4/asoc-intel-bytcr_rt5640-add-quirk-for-the-advantech-.patch-10536
deleted file mode 100644 (file)
index b99524b..0000000
--- a/queue-5.4/asoc-intel-bytcr_rt5640-add-quirk-for-the-advantech-.patch-10536
+++ /dev/null
@@ -1,59 +0,0 @@
-From 43a94a0cc3625f6dfd83b1894c093e4d08402520 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 13 Dec 2022 13:32:46 +0100
-Subject: ASoC: Intel: bytcr_rt5640: Add quirk for the Advantech MICA-071
- tablet
-
-From: Hans de Goede <hdegoede@redhat.com>
-
-[ Upstream commit a1dec9d70b6ad97087b60b81d2492134a84208c6 ]
-
-The Advantech MICA-071 tablet deviates from the defaults for
-a non CR Bay Trail based tablet in several ways:
-
-1. It uses an analog MIC on IN3 rather then using DMIC1
-2. It only has 1 speaker
-3. It needs the OVCD current threshold to be set to 1500uA instead of
-   the default 2000uA to reliable differentiate between headphones vs
-   headsets
-
-Add a quirk with these settings for this tablet.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Link: https://lore.kernel.org/r/20221213123246.11226-1-hdegoede@redhat.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/soc/intel/boards/bytcr_rt5640.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
-index 6a8edb0a559d..6da730636a85 100644
---- a/sound/soc/intel/boards/bytcr_rt5640.c
-+++ b/sound/soc/intel/boards/bytcr_rt5640.c
-@@ -453,6 +453,21 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
-                                       BYT_RT5640_SSP0_AIF1 |
-                                       BYT_RT5640_MCLK_EN),
-       },
-+      {
-+              /* Advantech MICA-071 */
-+              .matches = {
-+                      DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Advantech"),
-+                      DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "MICA-071"),
-+              },
-+              /* OVCD Th = 1500uA to reliable detect head-phones vs -set */
-+              .driver_data = (void *)(BYT_RT5640_IN3_MAP |
-+                                      BYT_RT5640_JD_SRC_JD2_IN4N |
-+                                      BYT_RT5640_OVCD_TH_1500UA |
-+                                      BYT_RT5640_OVCD_SF_0P75 |
-+                                      BYT_RT5640_MONO_SPEAKER |
-+                                      BYT_RT5640_DIFF_MIC |
-+                                      BYT_RT5640_MCLK_EN),
-+      },
-       {
-               .matches = {
-                       DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ARCHOS"),
--- 
-2.35.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index d076b46154aa83d95593053479c6c373ec58ea35..62f7a94a783b10ca24c931905327ea1a8c6000f1 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -612,7 +612,6 @@ drm-msm-adreno-make-adreno-quirks-not-overwrite-each-other.patch
 platform-x86-sony-laptop-don-t-turn-off-0x153-keyboard-backlight-during-probe.patch
 ixgbe-fix-pci-device-refcount-leak.patch
 ipv6-raw-deduct-extension-header-length-in-rawv6_push_pending_frames.patch
-asoc-intel-bytcr_rt5640-add-quirk-for-the-advantech-.patch-10536
 wifi-wilc1000-sdio-fix-module-autoloading.patch
 usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch
 ext4-provide-function-to-handle-transaction-restarts.patch