Refer to new "function" and "color" properties and mark "label"
as deprecated.

Signed-off-by: Jacek Anaszewski <jacek.anaszew...@gmail.com>
Cc: Linus Walleij <linus.wall...@linaro.org>
---
 .../devicetree/bindings/leds/leds-gpio.txt         | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/Documentation/devicetree/bindings/leds/leds-gpio.txt 
b/Documentation/devicetree/bindings/leds/leds-gpio.txt
index a48dda2..c34cb64 100644
--- a/Documentation/devicetree/bindings/leds/leds-gpio.txt
+++ b/Documentation/devicetree/bindings/leds/leds-gpio.txt
@@ -10,8 +10,12 @@ LED sub-node properties:
 - gpios :  Should specify the LED's GPIO, see "gpios property" in
   Documentation/devicetree/bindings/gpio/gpio.txt.  Active low LEDs should be
   indicated using flags in the GPIO specifier.
-- label :  (optional)
+- function :  (optional)
+  see Documentation/devicetree/bindings/leds/common.txt
+- color :  (optional)
   see Documentation/devicetree/bindings/leds/common.txt
+- label :  (optional)
+  see Documentation/devicetree/bindings/leds/common.txt (deprecated)
 - linux,default-trigger :  (optional)
   see Documentation/devicetree/bindings/leds/common.txt
 - default-state:  (optional) The initial state of the LED.
@@ -30,27 +34,30 @@ Examples:
 
 leds {
        compatible = "gpio-leds";
-       hdd {
-               label = "Disk Activity";
+       led@0 {
                gpios = <&mcu_pio 0 GPIO_ACTIVE_LOW>;
                linux,default-trigger = "disk-activity";
+               function = LED_FUNCTION_HDD;
        };
 
-       fault {
+       led@1 {
                gpios = <&mcu_pio 1 GPIO_ACTIVE_HIGH>;
                /* Keep LED on if BIOS detected hardware fault */
                default-state = "keep";
+               function = LED_FUNCTION_FAULT;
        };
 };
 
 run-control {
        compatible = "gpio-leds";
-       red {
+       led@0 {
                gpios = <&mpc8572 6 GPIO_ACTIVE_HIGH>;
+               color = "red";
                default-state = "off";
        };
-       green {
+       led@1 {
                gpios = <&mpc8572 7 GPIO_ACTIVE_HIGH>;
+               color = "green";
                default-state = "on";
        };
 };
@@ -58,9 +65,10 @@ run-control {
 leds {
        compatible = "gpio-leds";
 
-       charger-led {
+       led@0 {
                gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
                linux,default-trigger = "max8903-charger-charging";
                retain-state-suspended;
+               function = LED_FUNCTION_CHRG;
        };
 };
-- 
2.1.4

Reply via email to