Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / Documentation / devicetree / bindings / leds / common.txt

diff --git a/Documentation/devicetree/bindings/leds/common.txt b/Documentation/devicetree/bindings/leds/common.txt
index 93ef6e6e43b5cb08c7d586dd76a22eb2a35e9c35..24b6560140899aa8e956efa942f2074873e1f26b 100644 (file)
--- a/Documentation/devicetree/bindings/leds/common.txt
+++ b/Documentation/devicetree/bindings/leds/common.txt
@@ -19,6 +19,13 @@ Optional properties for child nodes:
          a device, i.e. no other LED class device can be assigned the same
          label.
 
+- default-state : The initial state of the LED. Valid values are "on", "off",
+  and "keep". If the LED is already on or off and the default-state property is
+  set the to same value, then no glitch should be produced where the LED
+  momentarily turns off (or on). The "keep" setting will keep the LED at
+  whatever its current state is, without producing a glitch.  The default is
+  off if this property is not present.
+
 - linux,default-trigger :  This parameter, if present, is a
     string defining the trigger assigned to the LED.  Current triggers are:
      "backlight" - LED will act as a back-light, controlled by the framebuffer
@@ -54,16 +61,24 @@ property can be omitted.
 
 Examples:
 
-system-status {
-       label = "Status";
-       linux,default-trigger = "heartbeat";
-       ...
+gpio-leds {
+       compatible = "gpio-leds";
+
+       system-status {
+               label = "Status";
+               linux,default-trigger = "heartbeat";
+               gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
+       };
 };
 
-camera-flash {
-       label = "Flash";
-       led-sources = <0>, <1>;
-       led-max-microamp = <50000>;
-       flash-max-microamp = <320000>;
-       flash-max-timeout-us = <500000>;
+max77693-led {
+       compatible = "maxim,max77693-led";
+
+       camera-flash {
+               label = "Flash";
+               led-sources = <0>, <1>;
+               led-max-microamp = <50000>;
+               flash-max-microamp = <320000>;
+               flash-max-timeout-us = <500000>;
+       };
 };