drop some broken patches from 5.10 and 5.15 that snuck in.

diff --git a/queue-5.10/asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch b/queue-5.10/asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch
deleted file mode 100644 (file)
index 7782d2a..0000000
--- a/queue-5.10/asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 7dd692217b861a8292ff8ac2c9d4458538fd6b96 Mon Sep 17 00:00:00 2001
-From: Mark Hasemeyer <markhas@chromium.org>
-Date: Fri, 20 Oct 2023 14:59:53 -0600
-Subject: ASoC: SOF: sof-pci-dev: Fix community key quirk detection
-
-From: Mark Hasemeyer <markhas@chromium.org>
-
-commit 7dd692217b861a8292ff8ac2c9d4458538fd6b96 upstream.
-
-Some Chromebooks do not populate the product family DMI value resulting
-in firmware load failures.
-
-Add another quirk detection entry that looks for "Google" in the BIOS
-version. Theoretically, PRODUCT_FAMILY could be replaced with
-BIOS_VERSION, but it is left as a quirk to be conservative.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Mark Hasemeyer <markhas@chromium.org>
-Acked-by: Curtis Malainey <cujomalainey@chromium.org>
-Link: https://lore.kernel.org/r/20231020145953.v1.1.Iaf5702dc3f8af0fd2f81a22ba2da1a5e15b3604c@changeid
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- sound/soc/sof/sof-pci-dev.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/sound/soc/sof/sof-pci-dev.c
-+++ b/sound/soc/sof/sof-pci-dev.c
-@@ -78,6 +78,13 @@ static const struct dmi_system_id commun
-                       DMI_MATCH(DMI_PRODUCT_FAMILY, "Google"),
-               }
-       },
-+      {
-+              .ident = "Google firmware",
-+              .callback = chromebook_use_community_key,
-+              .matches = {
-+                      DMI_MATCH(DMI_BIOS_VERSION, "Google"),
-+              }
-+      },
-       {},
- };
- 

diff --git a/queue-5.10/series b/queue-5.10/series
index da4477e351f7892f3a9b0c370fd49343ab7f8567..c8611cfa7287ade4a41fb2a5a497818ea1507566 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -93,5 +93,3 @@ tty-8250-add-support-for-additional-brainboxes-uc-cards.patch
 tty-8250-add-support-for-brainboxes-up-cards.patch
 tty-8250-add-support-for-intashield-is-100.patch
 alsa-hda-intel-dsp-config-fix-jsl-chromebook-quirk-detection.patch
-asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch
-tty-8250-add-support-for-intashield-ix-cards.patch

diff --git a/queue-5.10/tty-8250-add-support-for-intashield-ix-cards.patch b/queue-5.10/tty-8250-add-support-for-intashield-ix-cards.patch
deleted file mode 100644 (file)
index 5c56c12..0000000
--- a/queue-5.10/tty-8250-add-support-for-intashield-ix-cards.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 62d2ec2ded278c7512d91ca7bf8eb9bac46baf90 Mon Sep 17 00:00:00 2001
-From: Cameron Williams <cang1@live.co.uk>
-Date: Fri, 20 Oct 2023 17:03:16 +0100
-Subject: tty: 8250: Add support for Intashield IX cards
-
-From: Cameron Williams <cang1@live.co.uk>
-
-commit 62d2ec2ded278c7512d91ca7bf8eb9bac46baf90 upstream.
-
-Add support for the IX-100, IX-200 and IX-400 serial cards.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Cameron Williams <cang1@live.co.uk>
-Link: https://lore.kernel.org/r/DU0PR02MB7899614E5837E82A03272A4BC4DBA@DU0PR02MB7899.eurprd02.prod.outlook.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/tty/serial/8250/8250_pci.c |   21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
---- a/drivers/tty/serial/8250/8250_pci.c
-+++ b/drivers/tty/serial/8250/8250_pci.c
-@@ -5150,6 +5150,27 @@ static const struct pci_device_id serial
-       {       PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS400,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0,    /* 135a.0dc0 */
-               pbn_b2_4_115200 },
-+      /*
-+       * IntaShield IX-100
-+       */
-+      {       PCI_VENDOR_ID_INTASHIELD, 0x4027,
-+              PCI_ANY_ID, PCI_ANY_ID,
-+              0, 0,
-+              pbn_oxsemi_1_15625000 },
-+      /*
-+       * IntaShield IX-200
-+       */
-+      {       PCI_VENDOR_ID_INTASHIELD, 0x4028,
-+              PCI_ANY_ID, PCI_ANY_ID,
-+              0, 0,
-+              pbn_oxsemi_2_15625000 },
-+      /*
-+       * IntaShield IX-400
-+       */
-+      {       PCI_VENDOR_ID_INTASHIELD, 0x4029,
-+              PCI_ANY_ID, PCI_ANY_ID,
-+              0, 0,
-+              pbn_oxsemi_4_15625000 },
-       /* Brainboxes Devices */
-       /*
-       * Brainboxes UC-101

diff --git a/queue-5.15/asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch b/queue-5.15/asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch
deleted file mode 100644 (file)
index 6839856..0000000
--- a/queue-5.15/asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 7dd692217b861a8292ff8ac2c9d4458538fd6b96 Mon Sep 17 00:00:00 2001
-From: Mark Hasemeyer <markhas@chromium.org>
-Date: Fri, 20 Oct 2023 14:59:53 -0600
-Subject: ASoC: SOF: sof-pci-dev: Fix community key quirk detection
-
-From: Mark Hasemeyer <markhas@chromium.org>
-
-commit 7dd692217b861a8292ff8ac2c9d4458538fd6b96 upstream.
-
-Some Chromebooks do not populate the product family DMI value resulting
-in firmware load failures.
-
-Add another quirk detection entry that looks for "Google" in the BIOS
-version. Theoretically, PRODUCT_FAMILY could be replaced with
-BIOS_VERSION, but it is left as a quirk to be conservative.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Mark Hasemeyer <markhas@chromium.org>
-Acked-by: Curtis Malainey <cujomalainey@chromium.org>
-Link: https://lore.kernel.org/r/20231020145953.v1.1.Iaf5702dc3f8af0fd2f81a22ba2da1a5e15b3604c@changeid
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- sound/soc/sof/sof-pci-dev.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/sound/soc/sof/sof-pci-dev.c
-+++ b/sound/soc/sof/sof-pci-dev.c
-@@ -83,6 +83,13 @@ static const struct dmi_system_id commun
-                       DMI_MATCH(DMI_PRODUCT_FAMILY, "Google"),
-               }
-       },
-+      {
-+              .ident = "Google firmware",
-+              .callback = chromebook_use_community_key,
-+              .matches = {
-+                      DMI_MATCH(DMI_BIOS_VERSION, "Google"),
-+              }
-+      },
-       {},
- };
- 

diff --git a/queue-5.15/series b/queue-5.15/series
index c0c7413bbbdd87eba83b348afed373343a752ff0..5b26d36f80548ea0fbb3471d93ec4ba29c932e07 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -126,4 +126,3 @@ tty-8250-add-support-for-intashield-ix-cards.patch
 tty-8250-add-brainboxes-oxford-semiconductor-based-quirks.patch
 misc-pci_endpoint_test-add-deviceid-for-j721s2-pcie-ep-device-support.patch
 alsa-hda-intel-dsp-config-fix-jsl-chromebook-quirk-detection.patch
-asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch