Browse Source

x86: refresh patches for 6.1

Removed upstream merged patch:
113-v5.21-platform-x86-pmc_atom-Add-Lex-3I380NX-industrial-PC-.patch

Manually rebased:
103-pcengines_apu6_platform.patch

Signed-off-by: Pascal Coudurier <[email protected]>
Pascal Coudurier 2 years ago
parent
commit
b2c0e75c25

+ 2 - 2
target/linux/x86/patches-6.1/103-pcengines_apu6_platform.patch

@@ -63,7 +63,7 @@ Sighed-off-by: Philip Prindeville <[email protected]>
  
 --- a/drivers/platform/x86/Kconfig
 +++ b/drivers/platform/x86/Kconfig
-@@ -661,7 +661,7 @@ config XO1_RFKILL
+@@ -698,7 +698,7 @@ config XO1_RFKILL
  	  laptop.
  
  config PCENGINES_APU2
@@ -72,7 +72,7 @@ Sighed-off-by: Philip Prindeville <[email protected]>
  	depends on INPUT && INPUT_KEYBOARD && GPIOLIB
  	depends on LEDS_CLASS
  	select GPIO_AMD_FCH
-@@ -669,7 +669,7 @@ config PCENGINES_APU2
+@@ -706,7 +706,7 @@ config PCENGINES_APU2
  	select LEDS_GPIO
  	help
  	  This driver provides support for the front button and LEDs on

+ 0 - 52
target/linux/x86/patches-6.1/113-v5.21-platform-x86-pmc_atom-Add-Lex-3I380NX-industrial-PC-.patch

@@ -1,52 +0,0 @@
-From: Hans de Goede <[email protected]>
-Date: Thu, 28 Jul 2022 20:06:35 +0200
-Subject: platform/x86: pmc_atom: Match all Lex BayTrail boards with
- critclk_systems DMI table
-
-The critclk_systems[] DMI match table already contains 2 Lex BayTrail
-boards and patches were just submitted to add 3 more entries for the
-following models: 3I380NX, 3I380A, 3I380CW.
-
-Looking at: https://www.lex.com.tw/products/embedded-ipc-board/
-we can see that Lex BayTrail makes many embedded boards with
-multiple ethernet boards and none of their products are battery
-powered so we don't need to worry (too much) about power consumption
-when suspended.
-
-Add a new DMI match which simply matches all Lex BayTrail boards and drop
-the 2 existing board specific quirks.
-
-Reported-by: Michael Schöne <[email protected]>
-Reported-by: Paul Spooren <[email protected]>
-Reported-by: Matwey V. Kornilov <[email protected]>
-Signed-off-by: Hans de Goede <[email protected]>
----
---- a/drivers/platform/x86/pmc_atom.c
-+++ b/drivers/platform/x86/pmc_atom.c
-@@ -376,19 +376,15 @@ static const struct dmi_system_id critcl
- 		},
- 	},
- 	{
--		/* pmc_plt_clk0 - 3 are used for the 4 ethernet controllers */
--		.ident = "Lex 3I380D",
-+		/*
-+		 * Lex System / Lex Computech Co. makes a lot of Bay Trail
-+		 * based embedded boards which often come with multiple
-+		 * ethernet controllers using multiple pmc_plt_clks. See:
-+		 * https://www.lex.com.tw/products/embedded-ipc-board/
-+		 */
-+		.ident = "Lex BayTrail",
- 		.matches = {
- 			DMI_MATCH(DMI_SYS_VENDOR, "Lex BayTrail"),
--			DMI_MATCH(DMI_PRODUCT_NAME, "3I380D"),
--		},
--	},
--	{
--		/* pmc_plt_clk* - are used for ethernet controllers */
--		.ident = "Lex 2I385SW",
--		.matches = {
--			DMI_MATCH(DMI_SYS_VENDOR, "Lex BayTrail"),
--			DMI_MATCH(DMI_PRODUCT_NAME, "2I385SW"),
- 		},
- 	},
- 	{