diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2017-08-18 18:30:30 +0100 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2017-08-18 18:30:30 +0100 |
commit | cda94408d72526b520b7c87b91f5158bb723b900 (patch) | |
tree | e61e634c9198e41a1a0137d96c5455e25b8b300d /Documentation | |
parent | df5b95bee1ed7009a2090e9924e7a96e14850d56 (diff) | |
parent | e884f80cf2a76a86547e2316982e1f200f556ddf (diff) | |
download | linux-cda94408d72526b520b7c87b91f5158bb723b900.tar.gz linux-cda94408d72526b520b7c87b91f5158bb723b900.tar.bz2 linux-cda94408d72526b520b7c87b91f5158bb723b900.zip |
Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-next/core
* 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux:
arm64: perf: add support for Cortex-A35
arm64: perf: add support for Cortex-A73
arm64: perf: Remove redundant entries from CPU-specific event maps
arm64: perf: Connect additional events to pmu counters
arm64: perf: Allow standard PMUv3 events to be extended by the CPU type
perf: xgene: Remove unnecessary managed resources cleanup
arm64: perf: Allow more than one cycle counter to be used
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/arm/pmu.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/pmu.txt b/Documentation/devicetree/bindings/arm/pmu.txt index 61c8b4620415..13611a8199bb 100644 --- a/Documentation/devicetree/bindings/arm/pmu.txt +++ b/Documentation/devicetree/bindings/arm/pmu.txt @@ -9,9 +9,11 @@ Required properties: - compatible : should be one of "apm,potenza-pmu" "arm,armv8-pmuv3" + "arm,cortex-a73-pmu" "arm,cortex-a72-pmu" "arm,cortex-a57-pmu" "arm,cortex-a53-pmu" + "arm,cortex-a35-pmu" "arm,cortex-a17-pmu" "arm,cortex-a15-pmu" "arm,cortex-a12-pmu" |