Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[cascardo/linux.git] / Documentation / devicetree / bindings / arm / idle-states.txt

diff --git a/Documentation/devicetree/bindings/arm/idle-states.txt b/Documentation/devicetree/bindings/arm/idle-states.txt
index 37375c7..a8274ea 100644 (file)
--- a/Documentation/devicetree/bindings/arm/idle-states.txt
+++ b/Documentation/devicetree/bindings/arm/idle-states.txt
@@ -317,6 +317,26 @@ follows:
                            In such systems entry-latency-us + exit-latency-us
                            will exceed wakeup-latency-us by this duration.
 
+       - status:
+               Usage: Optional
+               Value type: <string>
+               Definition: A standard device tree property [5] that indicates
+                           the operational status of an idle-state.
+                           If present, it shall be:
+                           "okay": to indicate that the idle state is
+                                   operational.
+                           "disabled": to indicate that the idle state has
+                                       been disabled in firmware so it is not
+                                       operational.
+                           If the property is not present the idle-state must
+                           be considered operational.
+
+       - idle-state-name:
+               Usage: Optional
+               Value type: <string>
+               Definition: A string used as a descriptive name for the idle
+                           state.
+
        In addition to the properties listed above, a state node may require
        additional properties specifics to the entry-method defined in the
        idle-states node, please refer to the entry-method bindings