summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-07-28 17:05:55 +0200
committerWill Deacon <will.deacon@arm.com>2012-08-23 12:35:51 +0200
commit50243efde0993f6fe98f27a35692d0e8efdf7a0f (patch)
treee820f0fad68183e78fbe8730918330826ec84c22
parentARM: PMU: Add runtime PM Support (diff)
downloadlinux-50243efde0993f6fe98f27a35692d0e8efdf7a0f.tar.xz
linux-50243efde0993f6fe98f27a35692d0e8efdf7a0f.zip
ARM: perf: add devicetree bindings for 11MPcore, A5, A7 and A15 PMUs
This patch adds separate devicetree bindings for 11MPcore and Cortex-{A5,A7,A15} PMUs in preparation for improved devicetree parsing in the ARM perf-event CPU PMU driver. Cc: Grant Likely <grant.likely@secretlab.ca> Acked-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
-rw-r--r--Documentation/devicetree/bindings/arm/pmu.txt4
-rw-r--r--arch/arm/kernel/perf_event.c6
2 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/pmu.txt b/Documentation/devicetree/bindings/arm/pmu.txt
index 1c044eb320cc..343781b9f246 100644
--- a/Documentation/devicetree/bindings/arm/pmu.txt
+++ b/Documentation/devicetree/bindings/arm/pmu.txt
@@ -7,8 +7,12 @@ representation in the device tree should be done as under:-
Required properties:
- compatible : should be one of
+ "arm,cortex-a15-pmu"
"arm,cortex-a9-pmu"
"arm,cortex-a8-pmu"
+ "arm,cortex-a7-pmu"
+ "arm,cortex-a5-pmu"
+ "arm,arm11mpcore-pmu"
"arm,arm1176-pmu"
"arm,arm1136-pmu"
- interrupts : 1 combined interrupt or 1 per core.
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index c44647ef7357..3aa338849133 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -646,10 +646,14 @@ arch_initcall(cpu_pmu_reset);
* PMU platform driver and devicetree bindings.
*/
static struct of_device_id armpmu_of_device_ids[] = {
+ {.compatible = "arm,cortex-a15-pmu"},
{.compatible = "arm,cortex-a9-pmu"},
{.compatible = "arm,cortex-a8-pmu"},
- {.compatible = "arm,arm1136-pmu"},
+ {.compatible = "arm,cortex-a7-pmu"},
+ {.compatible = "arm,cortex-a5-pmu"},
+ {.compatible = "arm,arm11mpcore-pmu"},
{.compatible = "arm,arm1176-pmu"},
+ {.compatible = "arm,arm1136-pmu"},
{},
};