Merge tag 'sunxi-core-for-3.16-2' of https://github.com/mripard/linux into next/soc

[pandora-kernel.git] / Documentation / devicetree / bindings / arm / cpus.txt

diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt
index 4bbcf4f..e4b6daf 100644 (file)
--- a/Documentation/devicetree/bindings/arm/cpus.txt
+++ b/Documentation/devicetree/bindings/arm/cpus.txt
@@ -182,6 +182,8 @@ nodes to be present and contain the properties described below.
                             "psci"
                        # On ARM 32-bit systems this property is optional and
                          can be one of:
+                           "arm,psci"
+                           "allwinner,sun6i-a31"
                            "qcom,gcc-msm8660"
                            "qcom,kpss-acc-v1"
                            "qcom,kpss-acc-v2"