Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / drivers / led / led-uclass.c

diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c
index a80ae93d4512d43b7ada95e0e96d076e0139515b..2f4d69eedddc07fc9ff0c6a277a6558352b3c9db 100644 (file)
--- a/drivers/led/led-uclass.c
+++ b/drivers/led/led-uclass.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2015 Google, Inc
  * Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -22,27 +21,50 @@ int led_get_by_label(const char *label, struct udevice **devp)
        if (ret)
                return ret;
        uclass_foreach_dev(dev, uc) {
-               struct led_uclass_plat *uc_plat = dev_get_uclass_platdata(dev);
+               struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev);
 
-               if (!strcmp(label, uc_plat->label))
+               /* Ignore the top-level LED node */
+               if (uc_plat->label && !strcmp(label, uc_plat->label))
                        return uclass_get_device_tail(dev, 0, devp);
        }
 
-       return -ENOENT;
+       return -ENODEV;
 }
 
-int led_set_on(struct udevice *dev, int on)
+int led_set_state(struct udevice *dev, enum led_state_t state)
 {
        struct led_ops *ops = led_get_ops(dev);
 
-       if (!ops->set_on)
+       if (!ops->set_state)
                return -ENOSYS;
 
-       return ops->set_on(dev, on);
+       return ops->set_state(dev, state);
 }
 
+enum led_state_t led_get_state(struct udevice *dev)
+{
+       struct led_ops *ops = led_get_ops(dev);
+
+       if (!ops->get_state)
+               return -ENOSYS;
+
+       return ops->get_state(dev);
+}
+
+#ifdef CONFIG_LED_BLINK
+int led_set_period(struct udevice *dev, int period_ms)
+{
+       struct led_ops *ops = led_get_ops(dev);
+
+       if (!ops->set_period)
+               return -ENOSYS;
+
+       return ops->set_period(dev, period_ms);
+}
+#endif
+
 UCLASS_DRIVER(led) = {
        .id             = UCLASS_LED,
        .name           = "led",
-       .per_device_platdata_auto_alloc_size = sizeof(struct led_uclass_plat),
+       .per_device_platdata_auto_alloc_size = sizeof(struct led_uc_plat),
 };