@@ -63,7 +63,7 @@ Sighed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
6363
6464--- a/drivers/platform/x86/Kconfig
6565+++ b/drivers/platform/x86/Kconfig
66- @@ -754 ,7 +754 ,7 @@ config XO1_RFKILL
66+ @@ -573 ,7 +573 ,7 @@ config XO1_RFKILL
6767 laptop.
6868
6969 config PCENGINES_APU2
@@ -72,7 +72,7 @@ Sighed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
7272 depends on INPUT && INPUT_KEYBOARD && GPIOLIB
7373 depends on LEDS_CLASS
7474 select GPIO_AMD_FCH
75- @@ -762 ,7 +762 ,7 @@ config PCENGINES_APU2
75+ @@ -581 ,7 +581 ,7 @@ config PCENGINES_APU2
7676 select LEDS_GPIO
7777 help
7878 This driver provides support for the front button and LEDs on
@@ -159,9 +159,9 @@ Sighed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
159159+ #define APU5_GPIO_LINE_SIMSWAP1 7
160160+ #define APU5_GPIO_LINE_SIMSWAP2 8
161161+ #define APU5_GPIO_LINE_SIMSWAP3 9
162- +
163162
164163- /* GPIO device */
164+ +
165165+ /* GPIO device - APU2/3/4/6 */
166166
167167 static int apu2_gpio_regs[] = {
@@ -189,8 +189,8 @@ Sighed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
189189 };
190190
191191 static const struct amd_fch_gpio_pdata board_apu2 = {
192- @@ -72 ,6 +106 ,40 @@ static const struct amd_fch_gpio_pdata b
193- .gpio_names = apu2_gpio_names ,
192+ @@ -76 ,6 +110 ,40 @@ static const struct software_node apu2_g
193+ .name = AMD_FCH_GPIO_DRIVER_NAME ,
194194 };
195195
196196+ /* GPIO device - APU5 */
@@ -228,9 +228,9 @@ Sighed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
228228+ };
229229+
230230 /* GPIO LEDs device */
231-
232- static const struct gpio_led apu2_leds[] = {
233- @@ -215 ,6 +283 ,24 @@ static const struct dmi_system_id apu_gp
231+ static const struct software_node apu2_leds_node = {
232+ .name = "apu2-leds",
233+ @@ -246 ,6 +314 ,24 @@ static const struct dmi_system_id apu_gp
234234 },
235235 .driver_data = (void *)&board_apu2,
236236 },
@@ -255,7 +255,7 @@ Sighed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
255255 {}
256256 };
257257
258- @@ -249 ,7 +335 ,7 @@ static int __init apu_board_init(void)
258+ @@ -283 ,7 +369 ,7 @@ static int __init apu_board_init(void)
259259
260260 id = dmi_first_match(apu_gpio_dmi_table);
261261 if (!id) {
@@ -264,7 +264,7 @@ Sighed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
264264 return -ENODEV;
265265 }
266266
267- @@ -288 ,7 +374 ,7 @@ module_init(apu_board_init);
267+ @@ -332 ,7 +418 ,7 @@ module_init(apu_board_init);
268268 module_exit(apu_board_exit);
269269
270270 MODULE_AUTHOR("Enrico Weigelt, metux IT consult <info@metux.net>");
0 commit comments