[PATCH 69/75] patches: Remove additional DMI match in brcmfmac

Hauke Mehrtens <[email protected]> Fri, 28 Jun 2024 01:47:55 +0200
Newsgroups org.kernel.vger.backports
Message-ID <[email protected]>
Like some other matches on DMI_PRODUCT_SKU, also remove this newly added
on.

Signed-off-by: Hauke Mehrtens <[email protected]>
---
 patches/0089-unknown-dmi/brcmfmac.patch | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/patches/0089-unknown-dmi/brcmfmac.patch b/patches/0089-unknown-dmi/brcmfmac.patch
index dbd0337f..b6c95bec 100644
--- a/patches/0089-unknown-dmi/brcmfmac.patch
+++ b/patches/0089-unknown-dmi/brcmfmac.patch
@@ -20,7 +20,17 @@
  			/* also match on somewhat unique bios-version */
  			DMI_EXACT_MATCH(DMI_BIOS_VERSION, "1.000"),
  		},
-@@ -107,7 +111,9 @@ static const struct dmi_system_id dmi_pl
+@@ -96,7 +100,9 @@ static const struct dmi_system_id dmi_pl
+ 		.matches = {
+ 			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "Hampoo"),
+ 			DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
++#if LINUX_VERSION_IS_GEQ(4,18,0)
+ 			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "MRD"),
++#endif
+ 			/* Above strings are too generic, also match on BIOS date */
+ 			DMI_MATCH(DMI_BIOS_DATE, "05/10/2016"),
+ 		},
+@@ -107,7 +113,9 @@ static const struct dmi_system_id dmi_pl
  		.matches = {
  			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "Default string"),
  			DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
-- 
2.45.2