Merge tag 'devicetree-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git...

[muen/linux.git] / Documentation / devicetree / bindings / arm / cpus.txt

diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt
index 283c520a2224347051cf81bb9be7a02d13887e19..a44253cad2692e2c209e4fa1f148ccd89415496c 100644 (file)
--- a/Documentation/devicetree/bindings/arm/cpus.txt
+++ b/Documentation/devicetree/bindings/arm/cpus.txt
@@ -194,6 +194,7 @@ described below.
                             "spin-table"
                        # On ARM 32-bit systems this property is optional and
                          can be one of:
+                           "actions,s500-smp"
                            "allwinner,sun6i-a31"
                            "allwinner,sun8i-a23"
                            "arm,realview-smp"
@@ -250,7 +251,7 @@ described below.
                Usage: Optional
                Value type: <u32>
                Definition:
-                       # u32 value representing CPU capacity [3] in
+                       # u32 value representing CPU capacity [4] in
                          DMIPS/MHz, relative to highest capacity-dmips-mhz
                          in the system.
 
@@ -477,5 +478,5 @@ cpus {
 [2] arm/msm/qcom,kpss-acc.txt
 [3] ARM Linux kernel documentation - idle states bindings
     Documentation/devicetree/bindings/arm/idle-states.txt
-[3] ARM Linux kernel documentation - cpu capacity bindings
+[4] ARM Linux kernel documentation - cpu capacity bindings
     Documentation/devicetree/bindings/arm/cpu-capacity.txt