Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[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 c352c11bd6411c95f6a8ee381f3471f60a991337..b5804f46aafb1bc9a2964ac844589d0bd0f616b0 100644 (file)
--- a/Documentation/devicetree/bindings/arm/cpus.txt
+++ b/Documentation/devicetree/bindings/arm/cpus.txt
@@ -178,6 +178,7 @@ nodes to be present and contain the properties described below.
                            "marvell,sheeva-v5"
                            "nvidia,tegra132-denver"
                            "qcom,krait"
+                           "qcom,kryo"
                            "qcom,scorpion"
        - enable-method
                Value type: <stringlist>
@@ -191,6 +192,8 @@ nodes to be present and contain the properties described below.
                            "allwinner,sun6i-a31"
                            "allwinner,sun8i-a23"
                            "arm,psci"
+                           "arm,realview-smp"
+                           "brcm,bcm-nsp-smp"
                            "brcm,brahma-b15"
                            "marvell,armada-375-smp"
                            "marvell,armada-380-smp"
@@ -201,6 +204,7 @@ nodes to be present and contain the properties described below.
                            "qcom,gcc-msm8660"
                            "qcom,kpss-acc-v1"
                            "qcom,kpss-acc-v2"
+                           "rockchip,rk3036-smp"
                            "rockchip,rk3066-smp"
                            "ste,dbx500-smp"
 
@@ -247,7 +251,7 @@ nodes to be present and contain the properties described below.
                Usage: optional
                Value type: <prop-encoded-array>
                Definition: A u32 value that represents the running time dynamic
-                           power coefficient in units of mW/MHz/uVolt^2. The
+                           power coefficient in units of mW/MHz/uV^2. The
                            coefficient can either be calculated from power
                            measurements or derived by analysis.