Merge tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[deliverable/linux.git] / Documentation / devicetree / bindings / arm / cci.txt

diff --git a/Documentation/devicetree/bindings/arm/cci.txt b/Documentation/devicetree/bindings/arm/cci.txt
index 3c5c631328d3b6cbb4d7c9edefddf936347a545e..aef1d200a9b28f4d3643812312b3dd9aa3b86209 100644 (file)
--- a/Documentation/devicetree/bindings/arm/cci.txt
+++ b/Documentation/devicetree/bindings/arm/cci.txt
@@ -31,8 +31,9 @@ specific to ARM.
        - compatible
                Usage: required
                Value type: <string>
-               Definition: must be set to
+               Definition: must contain one of the following:
                            "arm,cci-400"
+                           "arm,cci-500"
 
        - reg
                Usage: required
@@ -99,6 +100,7 @@ specific to ARM.
                                 "arm,cci-400-pmu,r1"
                                 "arm,cci-400-pmu"  - DEPRECATED, permitted only where OS has
                                                      secure acces to CCI registers
+                                "arm,cci-500-pmu,r0"
                - reg:
                        Usage: required
                        Value type: Integer cells. A register entry, expressed