arm64: dts: apple: Rename dart-sio* to sio-dart*

[PATCH] arm64: dts: apple: Rename dart-sio* to sio-dart*

Posted by Hector Martin 2 years, 9 months ago

All the other DARTs are named foo-dart, so let's keep things consistent.

Fixes: 51979fbb7fb8 ("arm64: dts: apple: t600x: Add MCA and its support")
Fixes: 8a3df85ad87d ("arm64: dts: apple: t8103: Add MCA and its support")
Signed-off-by: Hector Martin <marcan@marcan.st>
---
 arch/arm64/boot/dts/apple/t600x-die0.dtsi | 6 +++---
 arch/arm64/boot/dts/apple/t8103.dtsi      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/boot/dts/apple/t600x-die0.dtsi b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
index 0b8958a8db77..e2f972c2c147 100644
--- a/arch/arm64/boot/dts/apple/t600x-die0.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
@@ -53,7 +53,7 @@ wdt: watchdog@2922b0000 {
 		interrupts = <AIC_IRQ 0 631 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
-	dart_sio_0: iommu@39b004000 {
+	sio_dart_0: iommu@39b004000 {
 		compatible = "apple,t6000-dart";
 		reg = <0x3 0x9b004000 0x0 0x4000>;
 		interrupt-parent = <&aic>;
@@ -62,7 +62,7 @@ dart_sio_0: iommu@39b004000 {
 		power-domains = <&ps_sio_cpu>;
 	};
 
-	dart_sio_1: iommu@39b008000 {
+	sio_dart_1: iommu@39b008000 {
 		compatible = "apple,t6000-dart";
 		reg = <0x3 0x9b008000 0x0 0x8000>;
 		interrupt-parent = <&aic>;
@@ -179,7 +179,7 @@ admac: dma-controller@39b400000 {
 				      <&aic AIC_IRQ 0 1118 IRQ_TYPE_LEVEL_HIGH>,
 				      <0>,
 				      <0>;
-		iommus = <&dart_sio_0 2>, <&dart_sio_1 2>;
+		iommus = <&sio_dart_0 2>, <&sio_dart_1 2>;
 		power-domains = <&ps_sio_adma>;
 		resets = <&ps_audio_p>;
 	};
diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi
index 6f5a2334e5b1..1ea760ef2c25 100644
--- a/arch/arm64/boot/dts/apple/t8103.dtsi
+++ b/arch/arm64/boot/dts/apple/t8103.dtsi
@@ -318,7 +318,7 @@ cpufreq_p: performance-controller@211e20000 {
 			#performance-domain-cells = <0>;
 		};
 
-		dart_sio: iommu@235004000 {
+		sio_dart: iommu@235004000 {
 			compatible = "apple,t8103-dart";
 			reg = <0x2 0x35004000 0x0 0x4000>;
 			interrupt-parent = <&aic>;
@@ -431,7 +431,7 @@ admac: dma-controller@238200000 {
 					      <0>,
 					      <0>;
 			#dma-cells = <1>;
-			iommus = <&dart_sio 2>;
+			iommus = <&sio_dart 2>;
 			power-domains = <&ps_sio_adma>;
 			resets = <&ps_audio_p>;
 		};
-- 
2.35.1

Re: [PATCH] arm64: dts: apple: Rename dart-sio* to sio-dart*

Posted by Mark Kettenis 2 years, 9 months ago

> From: Hector Martin <marcan@marcan.st>
> Date: Mon,  5 Dec 2022 19:02:11 +0900
> 
> All the other DARTs are named foo-dart, so let's keep things consistent.
> 
> Fixes: 51979fbb7fb8 ("arm64: dts: apple: t600x: Add MCA and its support")
> Fixes: 8a3df85ad87d ("arm64: dts: apple: t8103: Add MCA and its support")
> Signed-off-by: Hector Martin <marcan@marcan.st>

Consistency is good!

Reviewed-by: Mark Kettenis <kettenis@openbsd.org>

> ---
>  arch/arm64/boot/dts/apple/t600x-die0.dtsi | 6 +++---
>  arch/arm64/boot/dts/apple/t8103.dtsi      | 4 ++--
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/apple/t600x-die0.dtsi b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
> index 0b8958a8db77..e2f972c2c147 100644
> --- a/arch/arm64/boot/dts/apple/t600x-die0.dtsi
> +++ b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
> @@ -53,7 +53,7 @@ wdt: watchdog@2922b0000 {
>  		interrupts = <AIC_IRQ 0 631 IRQ_TYPE_LEVEL_HIGH>;
>  	};
>  
> -	dart_sio_0: iommu@39b004000 {
> +	sio_dart_0: iommu@39b004000 {
>  		compatible = "apple,t6000-dart";
>  		reg = <0x3 0x9b004000 0x0 0x4000>;
>  		interrupt-parent = <&aic>;
> @@ -62,7 +62,7 @@ dart_sio_0: iommu@39b004000 {
>  		power-domains = <&ps_sio_cpu>;
>  	};
>  
> -	dart_sio_1: iommu@39b008000 {
> +	sio_dart_1: iommu@39b008000 {
>  		compatible = "apple,t6000-dart";
>  		reg = <0x3 0x9b008000 0x0 0x8000>;
>  		interrupt-parent = <&aic>;
> @@ -179,7 +179,7 @@ admac: dma-controller@39b400000 {
>  				      <&aic AIC_IRQ 0 1118 IRQ_TYPE_LEVEL_HIGH>,
>  				      <0>,
>  				      <0>;
> -		iommus = <&dart_sio_0 2>, <&dart_sio_1 2>;
> +		iommus = <&sio_dart_0 2>, <&sio_dart_1 2>;
>  		power-domains = <&ps_sio_adma>;
>  		resets = <&ps_audio_p>;
>  	};
> diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi
> index 6f5a2334e5b1..1ea760ef2c25 100644
> --- a/arch/arm64/boot/dts/apple/t8103.dtsi
> +++ b/arch/arm64/boot/dts/apple/t8103.dtsi
> @@ -318,7 +318,7 @@ cpufreq_p: performance-controller@211e20000 {
>  			#performance-domain-cells = <0>;
>  		};
>  
> -		dart_sio: iommu@235004000 {
> +		sio_dart: iommu@235004000 {
>  			compatible = "apple,t8103-dart";
>  			reg = <0x2 0x35004000 0x0 0x4000>;
>  			interrupt-parent = <&aic>;
> @@ -431,7 +431,7 @@ admac: dma-controller@238200000 {
>  					      <0>,
>  					      <0>;
>  			#dma-cells = <1>;
> -			iommus = <&dart_sio 2>;
> +			iommus = <&sio_dart 2>;
>  			power-domains = <&ps_sio_adma>;
>  			resets = <&ps_audio_p>;
>  		};
> -- 
> 2.35.1
> 
> 
>

Re: [PATCH] arm64: dts: apple: Rename dart-sio* to sio-dart*

Posted by Sven Peter 2 years, 9 months ago


On Mon, Dec 5, 2022, at 11:02, Hector Martin wrote:
> All the other DARTs are named foo-dart, so let's keep things consistent.
>
> Fixes: 51979fbb7fb8 ("arm64: dts: apple: t600x: Add MCA and its support")
> Fixes: 8a3df85ad87d ("arm64: dts: apple: t8103: Add MCA and its support")
> Signed-off-by: Hector Martin <marcan@marcan.st>

Reviewed-by: Sven Peter <sven@svenpeter.dev>