aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-11-21 16:26:49 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-11-21 16:26:49 +0100
commita74a5a3381c0f600d390e3997976c4ddf31417ab (patch)
tree74f6a5d328f8d0f5026db63d5760c355bf938cc5 /Documentation
parentLinux 3.18-rc5 (diff)
parentdrivers: cpuidle: Remove cpuidle-arm64 duplicate error messages (diff)
downloadlinux-dev-a74a5a3381c0f600d390e3997976c4ddf31417ab.tar.xz
linux-dev-a74a5a3381c0f600d390e3997976c4ddf31417ab.zip
Merge branch 'cpuidle/3.19' of http://git.linaro.org/git-ro/people/daniel.lezcano/linux into pm-cpuidle
Pull ARM cpuidle material for 3.19-rc1 from Daniel Lezcano. * 'cpuidle/3.19' of http://git.linaro.org/git-ro/people/daniel.lezcano/linux: drivers: cpuidle: Remove cpuidle-arm64 duplicate error messages drivers: cpuidle: Add idle-state-name description to ARM idle states drivers: cpuidle: Add status property to ARM idle states
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/arm/idle-states.txt20
1 files changed, 20 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/idle-states.txt b/Documentation/devicetree/bindings/arm/idle-states.txt
index 37375c7f3ccc..a8274eabae2e 100644
--- 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