| Message ID | 20231011-pxa-gpio-v8-2-eed08a0fcac8@skole.hr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: pxa: GPIO descriptor conversions | expand |
On Wed, Oct 11, 2023 at 3:24 PM Duje Mihanović <duje.mihanovic@skole.hr> wrote: > > Sharp's Spitz board still uses the legacy GPIO interface for configuring > its two onboard LEDs. > > Convert them to use the GPIO descriptor interface. > > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> > Signed-off-by: Duje Mihanović <duje.mihanovic@skole.hr> > --- > arch/arm/mach-pxa/spitz.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c > index 535e2b2e997b..9efd603c715a 100644 > --- a/arch/arm/mach-pxa/spitz.c > +++ b/arch/arm/mach-pxa/spitz.c > @@ -452,16 +452,25 @@ static inline void spitz_keys_init(void) {} > * LEDs > ******************************************************************************/ > #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) > +static struct gpiod_lookup_table spitz_led_gpio_table = { > + .dev_id = "leds-gpio", > + .table = { > + GPIO_LOOKUP_IDX("pxa-gpio", SPITZ_GPIO_LED_ORANGE, NULL, 0, > + GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("pxa-gpio", SPITZ_GPIO_LED_GREEN, NULL, 1, > + GPIO_ACTIVE_HIGH), > + { } > + } > +}; > + > static struct gpio_led spitz_gpio_leds[] = { > { > .name = "spitz:amber:charge", > .default_trigger = "sharpsl-charge", > - .gpio = SPITZ_GPIO_LED_ORANGE, > }, > { > .name = "spitz:green:hddactivity", > .default_trigger = "disk-activity", > - .gpio = SPITZ_GPIO_LED_GREEN, > }, > }; > > @@ -480,6 +489,7 @@ static struct platform_device spitz_led_device = { > > static void __init spitz_leds_init(void) > { > + gpiod_add_lookup_table(&spitz_led_gpio_table); > platform_device_register(&spitz_led_device); > } > #else > > -- > 2.42.0 > > Which driver consumes these GPIOs? Doesn't it need any conversion? Bart
On Wednesday, October 11, 2023 4:21:39 PM CEST Bartosz Golaszewski wrote:
> Which driver consumes these GPIOs? Doesn't it need any conversion?
That is drivers/leds/leds-gpio.c which has already been converted to the
descriptor API way back in 5c51277a9aba ("leds: leds-gpio: Add support for
GPIO descriptors").
Regards,
Duje
On Wed, Oct 11, 2023 at 5:17 PM Duje Mihanović <duje.mihanovic@skole.hr> wrote: > > On Wednesday, October 11, 2023 4:21:39 PM CEST Bartosz Golaszewski wrote: > > Which driver consumes these GPIOs? Doesn't it need any conversion? > > That is drivers/leds/leds-gpio.c which has already been converted to the > descriptor API way back in 5c51277a9aba ("leds: leds-gpio: Add support for > GPIO descriptors"). > > Regards, > Duje > > > Perfect. In that case: Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 535e2b2e997b..9efd603c715a 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c @@ -452,16 +452,25 @@ static inline void spitz_keys_init(void) {} * LEDs ******************************************************************************/ #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) +static struct gpiod_lookup_table spitz_led_gpio_table = { + .dev_id = "leds-gpio", + .table = { + GPIO_LOOKUP_IDX("pxa-gpio", SPITZ_GPIO_LED_ORANGE, NULL, 0, + GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("pxa-gpio", SPITZ_GPIO_LED_GREEN, NULL, 1, + GPIO_ACTIVE_HIGH), + { } + } +}; + static struct gpio_led spitz_gpio_leds[] = { { .name = "spitz:amber:charge", .default_trigger = "sharpsl-charge", - .gpio = SPITZ_GPIO_LED_ORANGE, }, { .name = "spitz:green:hddactivity", .default_trigger = "disk-activity", - .gpio = SPITZ_GPIO_LED_GREEN, }, }; @@ -480,6 +489,7 @@ static struct platform_device spitz_led_device = { static void __init spitz_leds_init(void) { + gpiod_add_lookup_table(&spitz_led_gpio_table); platform_device_register(&spitz_led_device); } #else