aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVineet Gupta <vgupta@synopsys.com>2015-04-15 07:05:38 -0400
committerVineet Gupta <vgupta@synopsys.com>2015-04-20 08:57:36 -0400
commit30fdd373f24cc50e250c71a6e2df89505e267804 (patch)
treeaecf014d62177d8d438fa4a962c5556f491bc557
parent22f6b899125063c5dc955dd378c408b14d80b020 (diff)
ARC: perf: Rename DT binding to not confuse with power mgmt
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
-rw-r--r--Documentation/devicetree/bindings/arc/pct.txt20
-rw-r--r--Documentation/devicetree/bindings/arc/pmu.txt24
-rw-r--r--arch/arc/boot/dts/angel4.dts2
-rw-r--r--arch/arc/kernel/perf_event.c4
4 files changed, 23 insertions, 27 deletions
diff --git a/Documentation/devicetree/bindings/arc/pct.txt b/Documentation/devicetree/bindings/arc/pct.txt
new file mode 100644
index 000000000000..7b9588444f20
--- /dev/null
+++ b/Documentation/devicetree/bindings/arc/pct.txt
@@ -0,0 +1,20 @@
1* ARC Performance Counters
2
3The ARC700 can be configured with a pipeline performance monitor for counting
4CPU and cache events like cache misses and hits. Like conventional PCT there
5are 100+ hardware conditions dynamically mapped to upto 32 counters
6
7Note that:
8 * The ARC 700 PCT does not support interrupts; although HW events may be
9 counted, the HW events themselves cannot serve as a trigger for a sample.
10
11Required properties:
12
13- compatible : should contain
14 "snps,arc700-pct"
15
16Example:
17
18pmu {
19 compatible = "snps,arc700-pct";
20};
diff --git a/Documentation/devicetree/bindings/arc/pmu.txt b/Documentation/devicetree/bindings/arc/pmu.txt
deleted file mode 100644
index 49d517340de3..000000000000
--- a/Documentation/devicetree/bindings/arc/pmu.txt
+++ /dev/null
@@ -1,24 +0,0 @@
1* ARC Performance Monitor Unit
2
3The ARC 700 can be configured with a pipeline performance monitor for counting
4CPU and cache events like cache misses and hits.
5
6Note that:
7 * ARC 700 refers to a family of ARC processor cores;
8 - There is only one type of PMU available for the whole family;
9 - The PMU may support different sets of events; supported events are probed
10 at boot time, as required by the reference manual.
11
12 * The ARC 700 PMU does not support interrupts; although HW events may be
13 counted, the HW events themselves cannot serve as a trigger for a sample.
14
15Required properties:
16
17- compatible : should contain
18 "snps,arc700-pmu"
19
20Example:
21
22pmu {
23 compatible = "snps,arc700-pmu";
24};
diff --git a/arch/arc/boot/dts/angel4.dts b/arch/arc/boot/dts/angel4.dts
index 757e0c62c4f9..3b076fbd8366 100644
--- a/arch/arc/boot/dts/angel4.dts
+++ b/arch/arc/boot/dts/angel4.dts
@@ -64,7 +64,7 @@
64 }; 64 };
65 65
66 arcpmu0: pmu { 66 arcpmu0: pmu {
67 compatible = "snps,arc700-pmu"; 67 compatible = "snps,arc700-pct";
68 }; 68 };
69 }; 69 };
70}; 70};
diff --git a/arch/arc/kernel/perf_event.c b/arch/arc/kernel/perf_event.c
index 109118a4245e..165e0b604167 100644
--- a/arch/arc/kernel/perf_event.c
+++ b/arch/arc/kernel/perf_event.c
@@ -346,7 +346,7 @@ static int arc_pmu_device_probe(struct platform_device *pdev)
346 346
347#ifdef CONFIG_OF 347#ifdef CONFIG_OF
348static const struct of_device_id arc_pmu_match[] = { 348static const struct of_device_id arc_pmu_match[] = {
349 { .compatible = "snps,arc700-pmu" }, 349 { .compatible = "snps,arc700-pct" },
350 {}, 350 {},
351}; 351};
352MODULE_DEVICE_TABLE(of, arc_pmu_match); 352MODULE_DEVICE_TABLE(of, arc_pmu_match);
@@ -354,7 +354,7 @@ MODULE_DEVICE_TABLE(of, arc_pmu_match);
354 354
355static struct platform_driver arc_pmu_driver = { 355static struct platform_driver arc_pmu_driver = {
356 .driver = { 356 .driver = {
357 .name = "arc700-pmu", 357 .name = "arc700-pct",
358 .of_match_table = of_match_ptr(arc_pmu_match), 358 .of_match_table = of_match_ptr(arc_pmu_match),
359 }, 359 },
360 .probe = arc_pmu_device_probe, 360 .probe = arc_pmu_device_probe,