arm64: dts: juno: describe PMUs separately

The A57 and A53 PMUs in Juno support different events, so describe them
separately in both the Juno and Juno R1 DTs.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

2 files changed, 22 insertions, 14 deletions

diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts
index c62751153a4f..734e1272b19f 100644
--- a/arch/arm64/boot/dts/arm/juno-r1.dts
+++ b/arch/arm64/boot/dts/arm/juno-r1.dts
@@ -91,17 +91,21 @@
                 };
         };
 
-        pmu {
-                compatible = "arm,armv8-pmuv3";
+        pmu_a57 {
+                compatible = "arm,cortex-a57-pmu";
                 interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-affinity = <&A57_0>,
+                                     <&A57_1>;
+        };
+
+        pmu_a53 {
+                compatible = "arm,cortex-a53-pmu";
+                interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
                              <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
                              <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>,
                              <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-affinity = <&A57_0>,
-                                     <&A57_1>,
-                                     <&A53_0>,
+                interrupt-affinity = <&A53_0>,
                                      <&A53_1>,
                                      <&A53_2>,
                                      <&A53_3>;
diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts
index d7cbdd482a61..ffa05aeab3c7 100644
--- a/arch/arm64/boot/dts/arm/juno.dts
+++ b/arch/arm64/boot/dts/arm/juno.dts
@@ -91,17 +91,21 @@
                 };
         };
 
-        pmu {
-                compatible = "arm,armv8-pmuv3";
+        pmu_a57 {
+                compatible = "arm,cortex-a57-pmu";
                 interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-affinity = <&A57_0>,
+                                     <&A57_1>;
+        };
+
+        pmu_a53 {
+                compatible = "arm,cortex-a53-pmu";
+                interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
                              <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
                              <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>,
                              <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-affinity = <&A57_0>,
-                                     <&A57_1>,
-                                     <&A53_0>,
+                interrupt-affinity = <&A53_0>,
                                      <&A53_1>,
                                      <&A53_2>,
                                      <&A53_3>;