From 83c63f0d11856ab5664506f0dd12d7d76c46a3a4 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Mon, 4 Apr 2022 01:18:02 +0200 Subject: led: Move OF "label" property parsing to core Every driver in drivers/led/ currently does some form of "label" OF property parsing in its bind() callback. Move this label parsing to LED core, since this "label" OF property is a generic property. This permits code deduplication in subseuqent patches. Signed-off-by: Marek Vasut Cc: Alex Nemirovsky Cc: Patrick Delaunay Cc: Philippe Reynes Cc: Sean Anderson Cc: Simon Glass Cc: Steven Lawrance --- drivers/led/led-uclass.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'drivers/led/led-uclass.c') diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c index 7e298dbb06f..2f4aa18fb10 100644 --- a/drivers/led/led-uclass.c +++ b/drivers/led/led-uclass.c @@ -95,8 +95,20 @@ int led_default_state(void) return ret; } +static int led_post_bind(struct udevice *dev) +{ + struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev); + + uc_plat->label = dev_read_string(dev, "label"); + if (!uc_plat->label) + uc_plat->label = ofnode_get_name(dev_ofnode(dev)); + + return 0; +} + UCLASS_DRIVER(led) = { .id = UCLASS_LED, .name = "led", .per_device_plat_auto = sizeof(struct led_uc_plat), + .post_bind = led_post_bind, }; -- cgit v1.2.3 From 72675b063b6ede269a8edee29575ade02c21b58d Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Mon, 4 Apr 2022 01:23:27 +0200 Subject: led: Configure LED default-state on boot In case the DT LED subnode contains "default-state" property set to either "on" or "off", probe the LED driver and configure the LED state automatically. Signed-off-by: Marek Vasut Cc: Alex Nemirovsky Cc: Patrick Delaunay Cc: Philippe Reynes Cc: Sean Anderson Cc: Simon Glass Cc: Steven Lawrance [trini: Update the relevant test now that we have support] Signed-off-by: Tom Rini --- drivers/led/led-uclass.c | 57 +++++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 25 deletions(-) (limited to 'drivers/led/led-uclass.c') diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c index 2f4aa18fb10..5d7bf40896b 100644 --- a/drivers/led/led-uclass.c +++ b/drivers/led/led-uclass.c @@ -66,43 +66,49 @@ int led_set_period(struct udevice *dev, int period_ms) } #endif +/* This is superseded by led_post_bind()/led_post_probe() below. */ int led_default_state(void) { - struct udevice *dev; - struct uclass *uc; - const char *default_state; - int ret; - - ret = uclass_get(UCLASS_LED, &uc); - if (ret) - return ret; - for (uclass_find_first_device(UCLASS_LED, &dev); - dev; - uclass_find_next_device(&dev)) { - default_state = dev_read_string(dev, "default-state"); - if (!default_state) - continue; - ret = device_probe(dev); - if (ret) - return ret; - if (!strncmp(default_state, "on", 2)) - led_set_state(dev, LEDST_ON); - else if (!strncmp(default_state, "off", 3)) - led_set_state(dev, LEDST_OFF); - /* default-state = "keep" : device is only probed */ - } - - return ret; + return 0; } 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 = ofnode_get_name(dev_ofnode(dev)); + uc_plat->default_state = LEDST_COUNT; + + default_state = dev_read_string(dev, "default-state"); + if (!default_state) + return 0; + + if (!strncmp(default_state, "on", 2)) + uc_plat->default_state = LEDST_ON; + else if (!strncmp(default_state, "off", 3)) + uc_plat->default_state = LEDST_OFF; + else + return 0; + + /* + * In case the LED has default-state DT property, trigger + * probe() to configure its default state during startup. + */ + return device_probe(dev); +} + +static int led_post_probe(struct udevice *dev) +{ + struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev); + + if (uc_plat->default_state == LEDST_ON || + uc_plat->default_state == LEDST_OFF) + led_set_state(dev, uc_plat->default_state); + return 0; } @@ -111,4 +117,5 @@ UCLASS_DRIVER(led) = { .name = "led", .per_device_plat_auto = sizeof(struct led_uc_plat), .post_bind = led_post_bind, + .post_probe = led_post_probe, }; -- cgit v1.2.3