arm/arm64: dts: Drop "arm,armv8-pmuv3" compatible usage
authorRob Herring <robh@kernel.org>
Wed, 17 Apr 2024 20:38:47 +0000 (15:38 -0500)
committerArnd Bergmann <arnd@arndb.de>
Mon, 29 Apr 2024 08:27:52 +0000 (10:27 +0200)
The "arm,armv8-pmuv3" compatible is intended only for s/w models. Primarily,
it doesn't provide any detail on uarch specific events.

There's still remaining cases for CPUs without any corresponding PMU
definition and for big.LITTLE systems which only have a single PMU node
(there should be one per core type).

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Jisheng Zhang <jszhang@kernel.org>
Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Dinh Nguyen <dinguyen@kernel.org>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Bjorn Andersson <andersson@kernel.org>
Acked-by: Florian Fainelli <florian.fainelli@broadcom.com>
Acked-by: Alim Akhtar <alim.akhtar@samsung.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Link: https://lore.kernel.org/r/20240417203853.3212103-1-robh@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
31 files changed:
arch/arm/boot/dts/broadcom/bcm2711.dtsi
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
arch/arm64/boot/dts/amazon/alpine-v2.dtsi
arch/arm64/boot/dts/apm/apm-storm.dtsi
arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
arch/arm64/boot/dts/cavium/thunder-88xx.dtsi
arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi
arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
arch/arm64/boot/dts/freescale/imx8dxl.dtsi
arch/arm64/boot/dts/intel/keembay-soc.dtsi
arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
arch/arm64/boot/dts/marvell/armada-37xx.dtsi
arch/arm64/boot/dts/mediatek/mt8516.dtsi
arch/arm64/boot/dts/nvidia/tegra210.dtsi
arch/arm64/boot/dts/qcom/qcm2290.dtsi
arch/arm64/boot/dts/qcom/qdu1000.dtsi
arch/arm64/boot/dts/qcom/sdx75.dtsi
arch/arm64/boot/dts/realtek/rtd16xx.dtsi
arch/arm64/boot/dts/rockchip/rk3368.dtsi
arch/arm64/boot/dts/sprd/sc9860.dtsi
arch/arm64/boot/dts/sprd/sc9863a.dtsi
arch/arm64/boot/dts/synaptics/berlin4ct.dtsi
arch/arm64/boot/dts/tesla/fsd.dtsi
arch/arm64/boot/dts/xilinx/zynqmp.dtsi

index 22c7f1561344ed57978b4d91d6cdff6a6a84e9ff..926f87b8659055b78910b1bf7439ce3e351f8b97 100644 (file)
                };
        };
 
-       arm-pmu {
-               compatible = "arm,cortex-a72-pmu", "arm,armv8-pmuv3";
+       pmu {
+               compatible = "arm,cortex-a72-pmu";
                interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
                        <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
                        <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
index 072fe20cfca087635697d2b62171bcc854bf88b6..cbbc53c4792180d7b8ee75e7d25d79fc1caca5aa 100644 (file)
@@ -79,7 +79,7 @@
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a53-pmu";
                interrupts = <0 170 4>,
                             <0 171 4>,
                             <0 172 4>,
index dbf2dce8d1d68a5225311bf330704e9f6d1ead40..dbe21d88a29ea0600ffa6c03628ce4de9ccbaff5 100644 (file)
                };
 
                pmu {
-                       compatible = "arm,armv8-pmuv3";
+                       compatible = "arm,cortex-a57-pmu";
                        interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
index 988928c60f1515f5dd4551348358574cfb025572..ee3f838b4904c35023ac8b78f10bb4b19ceb7f96 100644 (file)
        };
 
        pmu {
-               compatible = "apm,potenza-pmu", "arm,armv8-pmuv3";
+               compatible = "apm,potenza-pmu";
                interrupts = <1 12 0xff04>;
        };
 
index 8db4243a494728fed2833d60edfb94e282c66ed0..9115c99d0dc02c8d47eb0f3ac2e0cdfcfa3bfc78 100644 (file)
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a53-pmu";
                interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
        };
index 896d1f33b5b6173e3b4b701d4e08f4ad277856e0..cfd9fd23a1c2a69968a4412ca201b19885403def 100644 (file)
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a57-pmu";
                interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>,
index d8516ec0dae7450e2c5e81f0bddf8ffdeba2bb5e..857fa427e195f0a0930685db348a4e5066ae20ec 100644 (file)
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a72-pmu";
                interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
        };
 
index 8ad31dee11a3c10e20e8d32ad6530d2f56dda9c0..4c9f1f80842744225f9f5aad2cb7d28036711e9f 100644 (file)
        };
 
        pmu {
-               compatible = "cavium,thunder-pmu", "arm,armv8-pmuv3";
+               compatible = "cavium,thunder-pmu";
                interrupts = <1 7 4>;
        };
 
index 3419bd252696c41e63735a40107822f4517b1296..68cb3d01187ac382b3ee70588d6bf5c0220aa049 100644 (file)
@@ -83,7 +83,7 @@
        };
 
        pmu {
-               compatible = "brcm,vulcan-pmu", "arm,armv8-pmuv3";
+               compatible = "brcm,vulcan-pmu";
                interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>; /* PMU overflow */
        };
 
index fe9093b3c02e2cdee19e8637b859d57122da1b65..a0f7bbd691a0047f5810aff4a34958cdc5dc75cf 100644 (file)
@@ -81,7 +81,7 @@
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a53-pmu";
                interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
        };
 
index d333b773bc455e5f2a5e370398fd458155965e23..8ee6d8c0ef6194fb8ba4e1155818e0dc43338722 100644 (file)
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a53-pmu";
                interrupts = <0 106 0x4>,
                             <0 107 0x4>,
                             <0 95 0x4>,
index 1aa38ed09aa4fa89c29f651d175e75c78593e079..8352197cea6f426fda2e8537f40965c567171306 100644 (file)
 #include <dt-bindings/clock/fsl,qoriq-clockgen.h>
 #include "fsl-ls208xa.dtsi"
 
+/ {
+       pmu {
+               compatible = "arm,cortex-a57-pmu";
+               interrupts = <1 7 0x8>; /* PMU PPI, Level low type */
+       };
+};
+
 &cpu {
        cpu0: cpu@0 {
                device_type = "cpu";
index 8581ea55d2540f087e5944beafde9a16f1637db4..245bbd615c81c14d8f83baaece9740191671da63 100644 (file)
 #include <dt-bindings/clock/fsl,qoriq-clockgen.h>
 #include "fsl-ls208xa.dtsi"
 
+/ {
+       pmu {
+               compatible = "arm,cortex-a72-pmu";
+               interrupts = <1 7 0x8>; /* PMU PPI, Level low type */
+       };
+};
+
 &cpu {
        cpu0: cpu@0 {
                device_type = "cpu";
index 0b72928359068057e4faddaab4628a9e6b5f8efd..ccba0a135b247e8c2f96e12c319c61c3d4efbd08 100644 (file)
                             <1 10 4>; /* Hypervisor PPI, active-low */
        };
 
-       pmu {
-               compatible = "arm,armv8-pmuv3";
-               interrupts = <1 7 0x8>; /* PMU PPI, Level low type */
-       };
-
        psci {
                compatible = "arm,psci-0.2";
                method = "smc";
index a0674c5c55766dd3971ceea33d2514a72d13c169..b8abd98bdc4377c093e5f5bc0613abfd4bc94045 100644 (file)
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a35-pmu";
                interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
        };
 
index 781761d2942b1b0804a8978458eea5f6e2391b1e..ae00e9e54e82cbb99ad79c126a76ac51534443c1 100644 (file)
@@ -70,7 +70,7 @@
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a53-pmu";
                interrupts = <GIC_PPI 0x7 IRQ_TYPE_LEVEL_HIGH>;
        };
 
index 76aafa172eb013ff22e601f1fcc9f1b07d960110..2a5eeb21da474fd01d4a22da06b2c0e78dac5221 100644 (file)
@@ -80,7 +80,7 @@
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a53-pmu";
                interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>,
index 5591939e057b8bd1d628223f20e986fe2f3df237..75377c292bcb6a57ea12215a9f4439c600942161 100644 (file)
@@ -68,7 +68,7 @@
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a55-pmu";
                interrupts = <GIC_PPI 12 IRQ_TYPE_LEVEL_HIGH>;
        };
 
index 1cc3fa1c354de81ca9f6eaa4257b9b561a0deb2a..9603223dd761f1a5c84ee8aeaf29d5461094fa58 100644 (file)
@@ -68,7 +68,7 @@
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a53-pmu";
                interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
        };
 
index 9cbd6dd8f671aa1c7056314481f776cb00c2b3fe..d0b03dc4d3f43aca71683a3d9b33a409b8ce237f 100644 (file)
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a35-pmu";
                interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_LOW>,
                             <GIC_SPI 5 IRQ_TYPE_LEVEL_LOW>,
                             <GIC_SPI 6 IRQ_TYPE_LEVEL_LOW>,
index 47f8268e46bf1b8c84cfb657c6cd253f24c4fca0..882b1d1f4ada8d9e275e5a6bee633a21cc6cdb2d 100644 (file)
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a57-pmu";
                interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>,
index 89beac833d43552197b88ac5b9d57c239a6bbb39..d3cd68190a17fa55b06ce57a9d21e9153f985d1d 100644 (file)
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a53-pmu";
                interrupts = <GIC_PPI 6 IRQ_TYPE_LEVEL_HIGH>;
        };
 
index 832f472c4b7a5ef05a6a5f8e6c537f64b4d1a14c..f2a5e2e40461fec72262e7d0b9957bafdb96ca67 100644 (file)
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a55-pmu";
                interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
        };
 
index 7dbdf8ca6de685bc7c0605619022eff149cc8c7c..b74cf4baedd6ac3184a0ed9b37e6f7e87fa83ae9 100644 (file)
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a55-pmu";
                interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
        };
 
index 34802cc62983868bfdb68dbe1e0a9f4cda700935..e57317a17aa9aa63c79e1dd7a7c345929a28dcd1 100644 (file)
        };
 
        arm_pmu: pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a55-pmu";
                interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW>;
                interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>,
                        <&cpu3>, <&cpu4>, <&cpu5>;
index 62af0cb94839bba5f6e0c6e368f65fa0f35d10de..734f87db4d115d9e45c72aca7a4f7eb99317b1c1 100644 (file)
        };
 
        arm-pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a53-pmu";
                interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>,
index e27eb3ed1d47991be7573d320eb6b5cae2f6a608..6bfdbdb0e1cd6dd8cddf3f77ae84db8463c930b6 100644 (file)
        };
 
        pmu {
-               compatible = "arm,cortex-a53-pmu", "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a53-pmu";
                interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
index 22d81ace740a0f4ed8159b059282e20dacbf70c1..53e5b77d70b5239f5dda5a055edb680ad66834f3 100644 (file)
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a55-pmu";
                interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>,
index 53d616c3cfed793cf0e0a44e04999ed47fc24cf7..71e4bfcc9e8128ff2c6a0ce358e7cc55941e6d3e 100644 (file)
@@ -88,7 +88,7 @@
        };
 
        pmu {
-               compatible = "arm,cortex-a53-pmu", "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a53-pmu";
                interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>,
index 047a83cee6038394ebe3082fdb0bfb1d578f767c..690b4ed9c29b928216832b6e82ffe6cbb9ad7333 100644 (file)
        };
 
        arm-pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a72-pmu";
                interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>,
index 25d20d8032305d1f922c3cbb28b9705bcd4b1e57..34d0e0be3fe61de5d45628bdb50660cde2df4538 100644 (file)
        };
 
        pmu {
-               compatible = "arm,armv8-pmuv3";
+               compatible = "arm,cortex-a53-pmu";
                interrupt-parent = <&gic>;
                interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>,