Skip to contentSkip to conversation

input: gpio-keys: make legacy gpiolib optional

PATCH Superseded Arnd Bergmann 4 participants 5 messages Apr 27 – Apr 29

Subsystems (4)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 input: gpio-keys: make legacy gpiolib optional

From: Arnd Bergmann <[email protected]>

Most users of gpio-keys and gpio-keys-polled use modern gpiolib interfaces, but there are still number of ancient sh, arm32 and x86 machines that have never been converted.

Add an #ifdef block for the parts of the driver that are only used on those legacy machines.

The two Rohm PMIC drivers use a gpio-keys device without an actual GPIO, passing an IRQ number instead. In order to keep this working both with and with CONFIG_GPIOLIB_LEGACY, change the gpio-keys driver to ignore the gpio number if an IRQ is passed.

---
v2: skip the fake GPIO number passing from mfd

---
 drivers/input/keyboard/gpio_keys.c        | 7 ++++---
 drivers/input/keyboard/gpio_keys_polled.c | 2 ++
 drivers/mfd/rohm-bd71828.c                | 1 -
 drivers/mfd/rohm-bd718x7.c                | 1 -
 include/linux/gpio_keys.h                 | 2 ++
 5 files changed, 8 insertions(+), 5 deletions(-)
drivers/input/keyboard/gpio_keys.c +4 -3
index aed4c9be35d2..e988657f97cb 100644
@@ -528,7 +528,8 @@ static int gpio_keys_setup_key(struct platform_device *pdev,
 			 */
 			bdata->gpiod = NULL;
 		}
-	} else if (gpio_is_valid(button->gpio)) {
+#ifdef CONFIG_GPIOLIB_LEGACY
+	} else if (!button->irq && gpio_is_valid(button->gpio)) {
 		/*
 		 * Legacy GPIO number, so request the GPIO here and
 		 * convert it to descriptor.
@@ -546,6 +547,7 @@ static int gpio_keys_setup_key(struct platform_device *pdev,
 
 		if (button->active_low ^ gpiod_is_active_low(bdata->gpiod))
 			gpiod_toggle_active_low(bdata->gpiod);
+#endif
 	}
 
 	if (bdata->gpiod) {
@@ -583,8 +585,7 @@ static int gpio_keys_setup_key(struct platform_device *pdev,
 			if (irq < 0) {
 				error = irq;
 				dev_err_probe(dev, error,
-					      "Unable to get irq number for GPIO %d\n",
-					      button->gpio);
+					      "Unable to get irq number for GPIO\n");
 				return error;
 			}
 			bdata->irq = irq;
drivers/input/keyboard/gpio_keys_polled.c +2 -0
index c7aea2cdd712..4e7a366ff05b 100644
@@ -301,6 +301,7 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
 				return dev_err_probe(dev, PTR_ERR(bdata->gpiod),
 						     "failed to get gpio\n");
 			}
+#ifdef CONFIG_GPIOLIB_LEGACY
 		} else if (gpio_is_valid(button->gpio)) {
 			/*
 			 * Legacy GPIO number so request the GPIO here and
@@ -323,6 +324,7 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
 
 			if (button->active_low ^ gpiod_is_active_low(bdata->gpiod))
 				gpiod_toggle_active_low(bdata->gpiod);
+#endif
 		}
 
 		bdata->last_state = -1;
drivers/mfd/rohm-bd71828.c +0 -1
index a79f354bf5cb..df6dad762ec9 100644
@@ -39,7 +39,6 @@
 
 static struct gpio_keys_button button = {
 	.code = KEY_POWER,
-	.gpio = -1,
 	.type = EV_KEY,
 	.wakeup = 1,
 };
drivers/mfd/rohm-bd718x7.c +0 -1
index ff714fd4f54d..dd774aa8828b 100644
@@ -20,7 +20,6 @@
 
 static struct gpio_keys_button button = {
 	.code = KEY_POWER,
-	.gpio = -1,
 	.type = EV_KEY,
 };
 
include/linux/gpio_keys.h +2 -0
index 80fa930b04c6..e8d6dc290efb 100644
@@ -25,7 +25,9 @@ struct device;
  */
 struct gpio_keys_button {
 	unsigned int code;
+#ifdef CONFIG_GPIOLIB_LEGACY
 	int gpio;
+#endif
 	int active_low;
 	const char *desc;
 	unsigned int type;
Signature · 1 line
2.39.5
maintainer
#1 lore raw
Quoted 16 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

Most users of gpio-keys and gpio-keys-polled use modern gpiolib interfaces, but there are still number of ancient sh, arm32 and x86 machines that have never been converted.

Add an #ifdef block for the parts of the driver that are only used on those legacy machines.

The two Rohm PMIC drivers use a gpio-keys device without an actual GPIO, passing an IRQ number instead. In order to keep this working both with and with CONFIG_GPIOLIB_LEGACY, change the gpio-keys driver to ignore the gpio number if an IRQ is passed.

Quoted 7 lines

---
v2: skip the fake GPIO number passing from mfd

---
 drivers/input/keyboard/gpio_keys.c        | 7 ++++---
 drivers/input/keyboard/gpio_keys_polled.c | 2 ++
 drivers/mfd/rohm-bd71828.c                | 1 -
 drivers/mfd/rohm-bd718x7.c                | 1 -

Let's see if my patches to rohm drivers will get accepted and then maybe we can remove legacy gpio API from gpio-keys altogether.

Thanks.

Signature · 1 line
Dmitry
#2 lore raw
Quoted 17 lines · Dmitry Torokhov
Quoted 8 lines · Arnd Bergmann

The two Rohm PMIC drivers use a gpio-keys device without an actual GPIO, passing an IRQ number instead. In order to keep this working both with and with CONFIG_GPIOLIB_LEGACY, change the gpio-keys driver to ignore the gpio number if an IRQ is passed.

Quoted 7 lines

---
v2: skip the fake GPIO number passing from mfd

---
 drivers/input/keyboard/gpio_keys.c        | 7 ++++---
 drivers/input/keyboard/gpio_keys_polled.c | 2 ++
 drivers/mfd/rohm-bd71828.c                | 1 -
 drivers/mfd/rohm-bd718x7.c                | 1 -
Quoted 2 lines

Let's see if my patches to rohm drivers will get accepted and then maybe we can remove legacy gpio API from gpio-keys altogether.

I think it would be good to still merge the drivers/input parts of my patch. Since CONFIG_GPIOLIB_LEGACY is still set unconditionally at the moment, that should work fine as long as your patches for the rohm drivers get merged before we turn off CONFIG_GPIOLIB_LEGACY for modern platforms.

In linux-next, I see these users of the legacy gpio-keys platform data remaining:

arch/arm/mach-mv78xx0/buffalo-wxl-setup.c
arch/arm/mach-orion5x/dns323-setup.c
arch/arm/mach-orion5x/mv2120-setup.c
arch/arm/mach-orion5x/net2big-setup.c
arch/arm/mach-orion5x/ts209-setup.c
arch/arm/mach-orion5x/ts409-setup.c
arch/arm/mach-s3c/mach-crag6410.c
arch/arm/mach-sa1100/assabet.c
arch/arm/mach-sa1100/collie.c
arch/arm/mach-sa1100/h3xxx.c
arch/mips/alchemy/devboards/db1300.c
arch/mips/bcm47xx/buttons.c
arch/sh/boards/mach-rsk/devices-rsk7203.c
arch/sh/boards/mach-x3proto/setup.c
drivers/input/misc/soc_button_array.c
drivers/mfd/ucb1x00-assabet.c

Do you already have patches for more of these? I would like to kill off mv78xx0, orion5x and sa1100 board files (including the ucb1x00-assabet mfd driver) soon, but that still leaves s3c, alchemy, bcm47xx, rsk and x3proto. These platforms are in varying states of disrepair, maybe a few more of those can be removed instead of converted. I know that Mark Brown is still using the s3c board, and Waldemar Brodkorb was recently working on restoring bcm47xx into a usable state.

I assume you'll take care of the soc_button_array one.

Arnd

maintainer
#3 lore raw
Quoted 30 lines · Arnd Bergmann
Quoted 17 lines · Dmitry Torokhov
Quoted 8 lines · Arnd Bergmann

The two Rohm PMIC drivers use a gpio-keys device without an actual GPIO, passing an IRQ number instead. In order to keep this working both with and with CONFIG_GPIOLIB_LEGACY, change the gpio-keys driver to ignore the gpio number if an IRQ is passed.

Quoted 7 lines

---
v2: skip the fake GPIO number passing from mfd

---
 drivers/input/keyboard/gpio_keys.c        | 7 ++++---
 drivers/input/keyboard/gpio_keys_polled.c | 2 ++
 drivers/mfd/rohm-bd71828.c                | 1 -
 drivers/mfd/rohm-bd718x7.c                | 1 -
Quoted 2 lines

Let's see if my patches to rohm drivers will get accepted and then maybe we can remove legacy gpio API from gpio-keys altogether.

I think it would be good to still merge the drivers/input parts of my patch. Since CONFIG_GPIOLIB_LEGACY is still set unconditionally at the moment, that should work fine as long as your patches for the rohm drivers get merged before we turn off CONFIG_GPIOLIB_LEGACY for modern platforms.

In linux-next, I see these users of the legacy gpio-keys platform data remaining:

Quoted 17 lines

arch/arm/mach-mv78xx0/buffalo-wxl-setup.c
arch/arm/mach-orion5x/dns323-setup.c
arch/arm/mach-orion5x/mv2120-setup.c
arch/arm/mach-orion5x/net2big-setup.c
arch/arm/mach-orion5x/ts209-setup.c
arch/arm/mach-orion5x/ts409-setup.c
arch/arm/mach-s3c/mach-crag6410.c
arch/arm/mach-sa1100/assabet.c
arch/arm/mach-sa1100/collie.c
arch/arm/mach-sa1100/h3xxx.c
arch/mips/alchemy/devboards/db1300.c
arch/mips/bcm47xx/buttons.c
arch/sh/boards/mach-rsk/devices-rsk7203.c
arch/sh/boards/mach-x3proto/setup.c
drivers/input/misc/soc_button_array.c
drivers/mfd/ucb1x00-assabet.c

Ah, yes :) I forgot about these...

Quoted 9 lines

Do you already have patches for more of these? I would like to kill off mv78xx0, orion5x and sa1100 board files (including the ucb1x00-assabet mfd driver) soon, but that still leaves s3c, alchemy, bcm47xx, rsk and x3proto. These platforms are in varying states of disrepair, maybe a few more of those can be removed instead of converted. I know that Mark Brown is still using the s3c board, and Waldemar Brodkorb was recently working on restoring bcm47xx into a usable state.

I have a bunch of patches for alchemyi (posted), rsk and x3proto. If we could kill sa1100 and assabet that would be really nice.

Thanks.

Signature · 1 line
Dmitry
maintainer Acked-by
#4 lore raw
In reply to Dmitry Torokhov

Hi deee Ho,

Quoted 25 lines · Dmitry Torokhov
Quoted 16 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

Most users of gpio-keys and gpio-keys-polled use modern gpiolib interfaces, but there are still number of ancient sh, arm32 and x86 machines that have never been converted.

Add an #ifdef block for the parts of the driver that are only used on those legacy machines.

The two Rohm PMIC drivers use a gpio-keys device without an actual GPIO, passing an IRQ number instead. In order to keep this working both with and with CONFIG_GPIOLIB_LEGACY, change the gpio-keys driver to ignore the gpio number if an IRQ is passed.

Quoted 7 lines

---
v2: skip the fake GPIO number passing from mfd

---
  drivers/input/keyboard/gpio_keys.c        | 7 ++++---
  drivers/input/keyboard/gpio_keys_polled.c | 2 ++
  drivers/mfd/rohm-bd71828.c                | 1 -
  drivers/mfd/rohm-bd718x7.c                | 1 -
Quoted 2 lines

Let's see if my patches to rohm drivers will get accepted and then maybe we can remove legacy gpio API from gpio-keys altogether.

What comes to the ROHM drivers, I am ok with the "swnode stuff" proposed by Dmitry (if it helps with cropping some legacy). Still, from the ROHM driver POV, I sure have no problems with just simple zeroing the gpios and providing the IRQ which in driver side is clean(ish) and simpl(ish) :)

So, in case someone opposes Dmitry's changes, for ROHM drivers:

Signature · 5 lines
Matti Vaittinen
Linux kernel developer at ROHM Semiconductors
Oulu Finland

~~ When things go utterly wrong vim users can always type :help! ~~