summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2020-12-09 21:04:48 +0300
committerCatalin Marinas <catalin.marinas@arm.com>2020-12-09 21:04:48 +0300
commitd8602f8bf3b2329c366dd37fc6adf573ba2c4784 (patch)
tree974f231149490efea056d6c65889fa18270ac976 /Documentation
parentba4259a6f87a4d7b5039673569db06b6d8b74cf3 (diff)
parent881b0520504a2e028a28ddacc05c26e46f21d483 (diff)
downloadlinux-d8602f8bf3b2329c366dd37fc6adf573ba2c4784.tar.xz
Merge remote-tracking branch 'arm64/for-next/perf' into for-next/core
* arm64/for-next/perf: perf/imx_ddr: Add system PMU identifier for userspace bindings: perf: imx-ddr: add compatible string arm64: Fix build failure when HARDLOCKUP_DETECTOR_PERF is enabled arm64: Enable perf events based hard lockup detector perf/imx_ddr: Add stop event counters support for i.MX8MP perf/smmuv3: Support sysfs identifier file drivers/perf: hisi: Add identifier sysfs file perf: remove duplicate check on fwnode driver/perf: Add PMU driver for the ARM DMC-620 memory controller
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/perf/fsl-imx-ddr.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/perf/fsl-imx-ddr.yaml b/Documentation/devicetree/bindings/perf/fsl-imx-ddr.yaml
index 5aad9f4e0b2a..80a92385367e 100644
--- a/Documentation/devicetree/bindings/perf/fsl-imx-ddr.yaml
+++ b/Documentation/devicetree/bindings/perf/fsl-imx-ddr.yaml
@@ -15,6 +15,9 @@ properties:
- enum:
- fsl,imx8-ddr-pmu
- fsl,imx8m-ddr-pmu
+ - fsl,imx8mq-ddr-pmu
+ - fsl,imx8mm-ddr-pmu
+ - fsl,imx8mn-ddr-pmu
- fsl,imx8mp-ddr-pmu
- items:
- enum: