[PATCH 3/3] led: gpio: Check device compatible string to determine the top level node

[Marek Vasut]

Since 2d1deaf88ed ("led: gpio: Drop duplicate OF "label" property parsing"),
all LED nodes have some sort of label. Use device_is_compatible(..."leds-gpio")
to determine whether this is a top-level node, since it is only the top
level node which is compatible with "leds-gpio", the GPIO LEDs subnodes
are not.

Fixes: 2d1deaf88ed ("led: gpio: Drop duplicate OF "label" property parsing")
Signed-off-by: Marek Vasut 
Cc: Patrice Chotard 
Cc: Patrick Delaunay 
Cc: Sean Anderson 
Cc: Simon Glass 
Cc: Steven Lawrance 
---
 drivers/led/led_gpio.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/led/led_gpio.c b/drivers/led/led_gpio.c
index 958dbd31e77..23156907593 100644
--- a/drivers/led/led_gpio.c
+++ b/drivers/led/led_gpio.c
@@ -57,12 +57,11 @@ static enum led_state_t gpio_led_get_state(struct udevice 
*dev)
 
 static int led_gpio_probe(struct udevice *dev)
 {
-   struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);
struct led_gpio_priv *priv = dev_get_priv(dev);
int ret;
 
/* Ignore the top-level LED node */
-   if (!uc_plat->label)
+   if (device_is_compatible(dev, "gpio-leds"))
return 0;
 
ret = gpio_request_by_name(dev, "gpios", 0, &priv->gpio, GPIOD_IS_OUT);
-- 
2.35.1

Re: [PATCH 3/3] led: gpio: Check device compatible string to determine the top level node

[Patrice CHOTARD]

Hi Marek

On 4/22/22 15:15, Marek Vasut wrote:
> Since 2d1deaf88ed ("led: gpio: Drop duplicate OF "label" property parsing"),
> all LED nodes have some sort of label. Use 
> device_is_compatible(..."leds-gpio")
> to determine whether this is a top-level node, since it is only the top
> level node which is compatible with "leds-gpio", the GPIO LEDs subnodes
> are not.
> 
> Fixes: 2d1deaf88ed ("led: gpio: Drop duplicate OF "label" property parsing")
> Signed-off-by: Marek Vasut 
> Cc: Patrice Chotard 
> Cc: Patrick Delaunay 
> Cc: Sean Anderson 
> Cc: Simon Glass 
> Cc: Steven Lawrance 
> ---
>  drivers/led/led_gpio.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/led/led_gpio.c b/drivers/led/led_gpio.c
> index 958dbd31e77..23156907593 100644
> --- a/drivers/led/led_gpio.c
> +++ b/drivers/led/led_gpio.c
> @@ -57,12 +57,11 @@ static enum led_state_t gpio_led_get_state(struct udevice 
> *dev)
>  
>  static int led_gpio_probe(struct udevice *dev)
>  {
> - struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);
>   struct led_gpio_priv *priv = dev_get_priv(dev);
>   int ret;
>  
>   /* Ignore the top-level LED node */
> - if (!uc_plat->label)
> + if (device_is_compatible(dev, "gpio-leds"))
>   return 0;
>  
>   ret = gpio_request_by_name(dev, "gpios", 0, &priv->gpio, GPIOD_IS_OUT);

Reviewed-by: Patrice Chotard 
Tested-by: Patrice Chotard 

Tested on stm32mp157c-dk2 board
Thanks
Patrice

Re: [PATCH 3/3] led: gpio: Check device compatible string to determine the top level node

[Tom Rini]

On Fri, Apr 22, 2022 at 03:15:55PM +0200, Marek Vasut wrote:

> Since 2d1deaf88ed ("led: gpio: Drop duplicate OF "label" property parsing"),
> all LED nodes have some sort of label. Use 
> device_is_compatible(..."leds-gpio")
> to determine whether this is a top-level node, since it is only the top
> level node which is compatible with "leds-gpio", the GPIO LEDs subnodes
> are not.
> 
> Fixes: 2d1deaf88ed ("led: gpio: Drop duplicate OF "label" property parsing")
> Signed-off-by: Marek Vasut 
> Cc: Patrice Chotard 
> Cc: Patrick Delaunay 
> Cc: Sean Anderson 
> Cc: Simon Glass 
> Cc: Steven Lawrance 
> Reviewed-by: Patrice Chotard 
> Tested-by: Patrice Chotard 

Applied to u-boot/master, thanks!

-- 
Tom


signature.asc
Description: PGP signature