diff mbox series

arm64: dts: exynos990: Rename and sort PMU nodes

Message ID 20250105-pmu-sorting-v1-1-b55519eaff2e@mentallysanemainliners.org (mailing list archive)
State New
Headers show
Series arm64: dts: exynos990: Rename and sort PMU nodes | expand

Commit Message

Igor Belwon Jan. 5, 2025, 11:16 a.m. UTC 
These nodes were sorted by name, but it's nice to have the same class of
devices together. As such, drop the pmu suffix and add "pmu" as a prefix.
This keeps consistency between other Exynos SoCs too.

Signed-off-by: Igor Belwon <igor.belwon@mentallysanemainliners.org>
---
 arch/arm64/boot/dts/exynos/exynos990.dtsi | 62 +++++++++++++++----------------
 1 file changed, 31 insertions(+), 31 deletions(-)


---
base-commit: 7c19e0e190aebd1c879a3913f1a8855a88d73a2a
change-id: 20250105-pmu-sorting-ec6954b6b659

Best regards,

Comments

Ivaylo Ivanov Jan. 5, 2025, 11:39 a.m. UTC | #1 
On 1/5/25 13:16, Igor Belwon wrote:
> These nodes were sorted by name, but it's nice to have the same class of
> devices together. As such, drop the pmu suffix and add "pmu" as a prefix.
> This keeps consistency between other Exynos SoCs too.

Well, most SoC device trees still have it as a suffix. Perhaps it'd be better to
apply this change for all exynos device trees instead of waiting for other
people to apply it separately?

Best regards,
Ivaylo

>
> Signed-off-by: Igor Belwon <igor.belwon@mentallysanemainliners.org>
> ---
>  arch/arm64/boot/dts/exynos/exynos990.dtsi | 62 +++++++++++++++----------------
>  1 file changed, 31 insertions(+), 31 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/exynos/exynos990.dtsi b/arch/arm64/boot/dts/exynos/exynos990.dtsi
> index 9d017dbed9523e874891f13258d331c3e829ca03..fc2c5049d764c3f50be7337bc777bb9561f88790 100644
> --- a/arch/arm64/boot/dts/exynos/exynos990.dtsi
> +++ b/arch/arm64/boot/dts/exynos/exynos990.dtsi
> @@ -25,37 +25,6 @@ aliases {
>  		pinctrl6 = &pinctrl_vts;
>  	};
>  
> -	arm-a55-pmu {
> -		compatible = "arm,cortex-a55-pmu";
> -		interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,
> -			     <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>,
> -			     <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>,
> -			     <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;
> -
> -		interrupt-affinity = <&cpu0>,
> -				     <&cpu1>,
> -				     <&cpu2>,
> -				     <&cpu3>;
> -	};
> -
> -	arm-a76-pmu {
> -		compatible = "arm,cortex-a76-pmu";
> -		interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>,
> -			     <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
> -
> -		interrupt-affinity = <&cpu4>,
> -				     <&cpu5>;
> -	};
> -
> -	mongoose-m5-pmu {
> -		compatible = "samsung,mongoose-pmu";
> -		interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>,
> -			     <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>;
> -
> -		interrupt-affinity = <&cpu6>,
> -				     <&cpu7>;
> -	};
> -
>  	cpus {
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> @@ -163,6 +132,37 @@ oscclk: clock-osc {
>  		clock-output-names = "oscclk";
>  	};
>  
> +	pmu-a55 {
> +		compatible = "arm,cortex-a55-pmu";
> +		interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,
> +			     <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>,
> +			     <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>,
> +			     <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;
> +
> +		interrupt-affinity = <&cpu0>,
> +				     <&cpu1>,
> +				     <&cpu2>,
> +				     <&cpu3>;
> +	};
> +
> +	pmu-a76 {
> +		compatible = "arm,cortex-a76-pmu";
> +		interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>,
> +			     <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
> +
> +		interrupt-affinity = <&cpu4>,
> +				     <&cpu5>;
> +	};
> +
> +	pmu-mongoose-m5 {
> +		compatible = "samsung,mongoose-pmu";
> +		interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>,
> +			     <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>;
> +
> +		interrupt-affinity = <&cpu6>,
> +				     <&cpu7>;
> +	};
> +
>  	psci {
>  		compatible = "arm,psci-0.2";
>  		method = "hvc";
>
> ---
> base-commit: 7c19e0e190aebd1c879a3913f1a8855a88d73a2a
> change-id: 20250105-pmu-sorting-ec6954b6b659
>
> Best regards,
Igor Belwon Jan. 5, 2025, 12:03 p.m. UTC | #2 
On Sun, Jan 05, 2025 at 01:39:04PM +0200, Ivaylo Ivanov wrote:
> On 1/5/25 13:16, Igor Belwon wrote:
> > These nodes were sorted by name, but it's nice to have the same class of
> > devices together. As such, drop the pmu suffix and add "pmu" as a prefix.
> > This keeps consistency between other Exynos SoCs too.
>
> Well, most SoC device trees still have it as a suffix. Perhaps it'd be better to
> apply this change for all exynos device trees instead of waiting for other
> people to apply it separately?
>
> Best regards,
> Ivaylo

Hi Ivaylo,

The newly-merged 9810 SoC had it hand-fixed by Krzysztof while being
merged [1], and there is a current patch to fix it on 8895 [2].
That's all the SoCs with Mongoose cores (and the Mongoose PMU breaks
sorting). Only 990 is missing this change.

[1] https://lore.kernel.org/linux-samsung-soc/d1c6d2f2-f733-4cbe-8108-c9c9aaa417cc@kernel.org/
[2] https://lore.kernel.org/linux-samsung-soc/20241222145257.31451-1-krzysztof.kozlowski@linaro.org/

Thanks and best regards,
Igor
Markuss Broks Jan. 5, 2025, 12:10 p.m. UTC | #3 
Hi Igor,

On 1/5/25 2:03 PM, Igor Belwon wrote:
> On Sun, Jan 05, 2025 at 01:39:04PM +0200, Ivaylo Ivanov wrote:
>> On 1/5/25 13:16, Igor Belwon wrote:
>>> These nodes were sorted by name, but it's nice to have the same class of
>>> devices together. As such, drop the pmu suffix and add "pmu" as a prefix.
>>> This keeps consistency between other Exynos SoCs too.
>> Well, most SoC device trees still have it as a suffix. Perhaps it'd be better to
>> apply this change for all exynos device trees instead of waiting for other
>> people to apply it separately?
>>
>> Best regards,
>> Ivaylo
> Hi Ivaylo,
>
> The newly-merged 9810 SoC had it hand-fixed by Krzysztof while being
> merged [1], and there is a current patch to fix it on 8895 [2].
> That's all the SoCs with Mongoose cores (and the Mongoose PMU breaks
> sorting). Only 990 is missing this change.
I believe for Cortex PMUs it's also preferred to use the e.g. pmu-a53 
name instead of arm-a53-pmu. This name is at least also used on 
exynosautov9, exynosautov920, exynos7885, exynos5433 and exynos7 (list 
not conclusive). So maybe could fix it on all SoCs at once, instead of 
making individual patches for every one. This is just a suggestion 
though, your patch seems ok.
>
> [1] https://lore.kernel.org/linux-samsung-soc/d1c6d2f2-f733-4cbe-8108-c9c9aaa417cc@kernel.org/
> [2] https://lore.kernel.org/linux-samsung-soc/20241222145257.31451-1-krzysztof.kozlowski@linaro.org/
>
> Thanks and best regards,
> Igor
>

- Markuss
Igor Belwon Jan. 5, 2025, 12:18 p.m. UTC | #4 
On Sun, Jan 05, 2025 at 02:10:37PM +0200, Markuss Broks wrote:
Hi Markuss,
> Hi Igor,
> 
> On 1/5/25 2:03 PM, Igor Belwon wrote:
> > On Sun, Jan 05, 2025 at 01:39:04PM +0200, Ivaylo Ivanov wrote:
> > > On 1/5/25 13:16, Igor Belwon wrote:
> > > > These nodes were sorted by name, but it's nice to have the same class of
> > > > devices together. As such, drop the pmu suffix and add "pmu" as a prefix.
> > > > This keeps consistency between other Exynos SoCs too.
> > > Well, most SoC device trees still have it as a suffix. Perhaps it'd be better to
> > > apply this change for all exynos device trees instead of waiting for other
> > > people to apply it separately?
> > > 
> > > Best regards,
> > > Ivaylo
> > Hi Ivaylo,
> > 
> > The newly-merged 9810 SoC had it hand-fixed by Krzysztof while being
> > merged [1], and there is a current patch to fix it on 8895 [2].
> > That's all the SoCs with Mongoose cores (and the Mongoose PMU breaks
> > sorting). Only 990 is missing this change.
> I believe for Cortex PMUs it's also preferred to use the e.g. pmu-a53 name
> instead of arm-a53-pmu. This name is at least also used on exynosautov9,
> exynosautov920, exynos7885, exynos5433 and exynos7 (list not conclusive). So
> maybe could fix it on all SoCs at once, instead of making individual patches
> for every one. This is just a suggestion though, your patch seems ok.
Thank you for the suggestion! I held off on doing this because in the
8895 patch, Krzysztof said that the pure-ARM design PMU naming was too
trivial and unimportant to change. Mongoose PMU however breaks sorting
in the tree, so unlike the arm-pmus, it's more important.

It's up to Krzysztof if he wishes a global change for all affected
Exynos trees.

> > 
> > [1] https://lore.kernel.org/linux-samsung-soc/d1c6d2f2-f733-4cbe-8108-c9c9aaa417cc@kernel.org/
> > [2] https://lore.kernel.org/linux-samsung-soc/20241222145257.31451-1-krzysztof.kozlowski@linaro.org/
> > 
> > Thanks and best regards,
> > Igor
> > 
> 
> - Markuss
> 
Best regards,
Igor
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/exynos/exynos990.dtsi b/arch/arm64/boot/dts/exynos/exynos990.dtsi
index 9d017dbed9523e874891f13258d331c3e829ca03..fc2c5049d764c3f50be7337bc777bb9561f88790 100644
--- a/arch/arm64/boot/dts/exynos/exynos990.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos990.dtsi
@@ -25,37 +25,6 @@  aliases {
 		pinctrl6 = &pinctrl_vts;
 	};
 
-	arm-a55-pmu {
-		compatible = "arm,cortex-a55-pmu";
-		interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;
-
-		interrupt-affinity = <&cpu0>,
-				     <&cpu1>,
-				     <&cpu2>,
-				     <&cpu3>;
-	};
-
-	arm-a76-pmu {
-		compatible = "arm,cortex-a76-pmu";
-		interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
-
-		interrupt-affinity = <&cpu4>,
-				     <&cpu5>;
-	};
-
-	mongoose-m5-pmu {
-		compatible = "samsung,mongoose-pmu";
-		interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>;
-
-		interrupt-affinity = <&cpu6>,
-				     <&cpu7>;
-	};
-
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -163,6 +132,37 @@  oscclk: clock-osc {
 		clock-output-names = "oscclk";
 	};
 
+	pmu-a55 {
+		compatible = "arm,cortex-a55-pmu";
+		interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;
+
+		interrupt-affinity = <&cpu0>,
+				     <&cpu1>,
+				     <&cpu2>,
+				     <&cpu3>;
+	};
+
+	pmu-a76 {
+		compatible = "arm,cortex-a76-pmu";
+		interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
+
+		interrupt-affinity = <&cpu4>,
+				     <&cpu5>;
+	};
+
+	pmu-mongoose-m5 {
+		compatible = "samsung,mongoose-pmu";
+		interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>;
+
+		interrupt-affinity = <&cpu6>,
+				     <&cpu7>;
+	};
+
 	psci {
 		compatible = "arm,psci-0.2";
 		method = "hvc";