diff options
| -rw-r--r-- | Documentation/devicetree/bindings/arm/pmu.txt | 1 | ||||
| -rw-r--r-- | arch/arm64/kernel/perf_debug.c | 1 | ||||
| -rw-r--r-- | arch/arm64/kernel/perf_event.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/pmu.txt b/Documentation/devicetree/bindings/arm/pmu.txt index 97ba45af04fc..d21009c218ee 100644 --- a/Documentation/devicetree/bindings/arm/pmu.txt +++ b/Documentation/devicetree/bindings/arm/pmu.txt @@ -24,6 +24,7 @@ Required properties: "qcom,scorpion-pmu" "qcom,scorpion-mp-pmu" "qcom,krait-pmu" + "qcom,kryo-pmuv3" - interrupts : 1 combined interrupt or 1 per core. If the interrupt is a per-cpu interrupt (PPI) then 1 interrupt should be specified. diff --git a/arch/arm64/kernel/perf_debug.c b/arch/arm64/kernel/perf_debug.c index 34f05bfea42e..ef3313fd16c6 100644 --- a/arch/arm64/kernel/perf_debug.c +++ b/arch/arm64/kernel/perf_debug.c @@ -31,6 +31,7 @@ static char *descriptions = "11 Perf: arm64: Refine disable/enable in tracecounters\n" "15 Perf: arm64: make debug dir handle exportable\n" "16 Perf: arm64: add perf trace user\n" + "17 Perf: arm64: add support for kryo pmu\n" ; static ssize_t desc_read(struct file *fp, char __user *buf, diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index f6abf16618e8..2f0fb64dab45 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -674,6 +674,7 @@ static const struct of_device_id armv8_pmu_of_device_ids[] = { {.compatible = "arm,armv8-pmuv3", .data = armv8_pmuv3_init}, {.compatible = "arm,cortex-a53-pmu", .data = armv8_a53_pmu_init}, {.compatible = "arm,cortex-a57-pmu", .data = armv8_a57_pmu_init}, + {.compatible = "qcom,kryo-pmuv3", .data = kryo_pmu_init}, {}, }; |