diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-11-13 21:41:40 +0400 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-11-13 21:41:40 +0400 |
commit | 27033a50f9304e0b7ad420c3f04b96c3bcbe1866 (patch) | |
tree | 09793e91dc3001f915fc73b7b41ecb52b0a12cfd /Documentation | |
parent | 95881bef21e2bfa602811db712fd4b99f021367e (diff) | |
parent | c7284347376f47408094e99fc8a242c5c521b525 (diff) |
Automatically merging tracking-big-LITTLE-MP-v11 into merge-linux-linaro-core-tracking
Conflicting files:
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/arm/pmu.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/pmu.txt b/Documentation/devicetree/bindings/arm/pmu.txt index 343781b9f246..4ce82d045a6b 100644 --- a/Documentation/devicetree/bindings/arm/pmu.txt +++ b/Documentation/devicetree/bindings/arm/pmu.txt @@ -16,6 +16,9 @@ Required properties: "arm,arm1176-pmu" "arm,arm1136-pmu" - interrupts : 1 combined interrupt or 1 per core. +- cluster : a phandle to the cluster to which it belongs + If there are more than one cluster with same CPU type + then there should be separate PMU nodes per cluster. Example: |