Merge tag 'gpio-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / arm / cpus.txt

diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt
index 298e2f6b33c63a3ce1241b71dce1c2d65164c1b3..fc446347ab6db4be375cb8125647b8585cba54ae 100644 (file)
--- a/Documentation/devicetree/bindings/arm/cpus.txt
+++ b/Documentation/devicetree/bindings/arm/cpus.txt
@@ -166,6 +166,7 @@ nodes to be present and contain the properties described below.
                            "arm,cortex-r5"
                            "arm,cortex-r7"
                            "brcm,brahma-b15"
+                           "cavium,thunder"
                            "faraday,fa526"
                            "intel,sa110"
                            "intel,sa1100"
@@ -219,6 +220,12 @@ nodes to be present and contain the properties described below.
                Value type: <phandle>
                Definition: Specifies the ACC[2] node associated with this CPU.
 
+       - cpu-idle-states
+               Usage: Optional
+               Value type: <prop-encoded-array>
+               Definition:
+                       # List of phandles to idle state nodes supported
+                         by this cpu [3].
 
 Example 1 (dual-cluster big.LITTLE system 32-bit):
 
@@ -415,3 +422,5 @@ cpus {
 --
 [1] arm/msm/qcom,saw2.txt
 [2] arm/msm/qcom,kpss-acc.txt
+[3] ARM Linux kernel documentation - idle states bindings
+    Documentation/devicetree/bindings/arm/idle-states.txt