From: Rasmus Villemoes Date: Fri, 17 Nov 2023 11:38:06 +0000 (+0100) Subject: led-uclass: honour ->label field populated by driver's own .bind X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=5bf61f918df2140bec16ef574afe8b1490738df3;p=u-boot.git led-uclass: honour ->label field populated by driver's own .bind If the driver's own .bind method has populated uc_plat->label, don't override that. This is necessary for an upcoming driver for ti,lp5562, where the DT binding unfortunately says to use "chan-name" and not "label". Reviewed-by: Christian Gmeiner Reviewed-by: Marek Vasut Signed-off-by: Rasmus Villemoes --- diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c index 68ca3c2970..009f108019 100644 --- a/drivers/led/led-uclass.c +++ b/drivers/led/led-uclass.c @@ -71,7 +71,9 @@ static int led_post_bind(struct udevice *dev) struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev); const char *default_state; - uc_plat->label = dev_read_string(dev, "label"); + if (!uc_plat->label) + uc_plat->label = dev_read_string(dev, "label"); + if (!uc_plat->label) uc_plat->label = ofnode_get_name(dev_ofnode(dev));