diff options
author | Will Deacon <will.deacon@arm.com> | 2012-07-28 11:05:55 -0400 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2012-08-23 06:35:51 -0400 |
commit | 50243efde0993f6fe98f27a35692d0e8efdf7a0f (patch) | |
tree | e820f0fad68183e78fbe8730918330826ec84c22 /arch/arm/kernel/perf_event.c | |
parent | 7be2958e97b37256b8016db39ac6cf51f711e390 (diff) |
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>
Diffstat (limited to 'arch/arm/kernel/perf_event.c')
-rw-r--r-- | arch/arm/kernel/perf_event.c | 6 |
1 files changed, 5 insertions, 1 deletions
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); | |||
646 | * PMU platform driver and devicetree bindings. | 646 | * PMU platform driver and devicetree bindings. |
647 | */ | 647 | */ |
648 | static struct of_device_id armpmu_of_device_ids[] = { | 648 | static struct of_device_id armpmu_of_device_ids[] = { |
649 | {.compatible = "arm,cortex-a15-pmu"}, | ||
649 | {.compatible = "arm,cortex-a9-pmu"}, | 650 | {.compatible = "arm,cortex-a9-pmu"}, |
650 | {.compatible = "arm,cortex-a8-pmu"}, | 651 | {.compatible = "arm,cortex-a8-pmu"}, |
651 | {.compatible = "arm,arm1136-pmu"}, | 652 | {.compatible = "arm,cortex-a7-pmu"}, |
653 | {.compatible = "arm,cortex-a5-pmu"}, | ||
654 | {.compatible = "arm,arm11mpcore-pmu"}, | ||
652 | {.compatible = "arm,arm1176-pmu"}, | 655 | {.compatible = "arm,arm1176-pmu"}, |
656 | {.compatible = "arm,arm1136-pmu"}, | ||
653 | {}, | 657 | {}, |
654 | }; | 658 | }; |
655 | 659 | ||