Skip to contentSkip to conversation

arm64: tegra: Sort properties more logically

PATCH In review Thierry Reding 2 participants 4 messages Jun 9, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 arm64: tegra: Sort properties more logically

From: Thierry Reding <[email protected]>

We typically sort the "compatible" property first because it defines what the remainder of the properties can be. For the sound node on the Jetson AGX Orin this wasn't done, so fix that up.

---
 arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts +1 -2
index ac64dac287de..e499010fc673 100644
@@ -2345,9 +2345,8 @@ serial {
 	};
 
 	sound {
-		status = "okay";
-
 		compatible = "nvidia,tegra186-audio-graph-card";
+		status = "okay";
 
 		dais = /* ADMAIF (FE) Ports */
 		       <&admaif0_port>, <&admaif1_port>, <&admaif2_port>, <&admaif3_port>,
Signature · 1 line
2.40.1
#1 lore raw

PATCH 2/2 arm64: tegra: Add a few blank lines for better readability

From: Thierry Reding <[email protected]>

Surround device tree nodes with blank lines for increased readability.

---
 .../boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 10 ++++++++++
 1 file changed, 10 insertions(+)
arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts +10 -0
index e499010fc673..5f3d6dcf10a2 100644
@@ -2247,6 +2247,7 @@ TEGRA234_AON_GPIO(AA, 4)
 
 		i2c@c240000 {
 			status = "okay";
+
 			typec@8 {
 				compatible = "cypress,cypd4226";
 				reg = <0x08>;
@@ -2254,22 +2255,27 @@ typec@8 {
 				interrupts = <TEGRA234_MAIN_GPIO(Y, 4) IRQ_TYPE_LEVEL_LOW>;
 				firmware-name = "nvidia,jetson-agx-xavier";
 				status = "okay";
+
 				#address-cells = <1>;
 				#size-cells = <0>;
+
 				ccg_typec_con0: connector@0 {
 					compatible = "usb-c-connector";
 					reg = <0>;
 					label = "USB-C";
 					data-role = "host";
+
 					ports {
 						#address-cells = <1>;
 						#size-cells = <0>;
+
 						port@0 {
 							reg = <0>;
 							hs_ucsi_ccg_p0: endpoint {
 								remote-endpoint = <&hs_typec_p0>;
 							};
 						};
+
 						port@1 {
 							reg = <1>;
 							ss_ucsi_ccg_p0: endpoint {
@@ -2278,20 +2284,24 @@ ss_ucsi_ccg_p0: endpoint {
 						};
 					};
 				};
+
 				ccg_typec_con1: connector@1 {
 					compatible = "usb-c-connector";
 					reg = <1>;
 					label = "USB-C";
 					data-role = "dual";
+
 					ports {
 						#address-cells = <1>;
 						#size-cells = <0>;
+
 						port@0 {
 							reg = <0>;
 							hs_ucsi_ccg_p1: endpoint {
 								remote-endpoint = <&hs_typec_p1>;
 							};
 						};
+
 						port@1 {
 							reg = <1>;
 							ss_ucsi_ccg_p1: endpoint {
Signature · 1 line
2.40.1
maintainer Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] arm64: tegra: Add a few blank lines for better readability

Quoted 64 lines · Thierry Reding

From: Thierry Reding <[email protected]>

Surround device tree nodes with blank lines for increased readability.

---
  .../boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 10 ++++++++++
  1 file changed, 10 insertions(+)
arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts +9 -0
index e499010fc673..5f3d6dcf10a2 100644
@@ -2247,6 +2247,7 @@ TEGRA234_AON_GPIO(AA, 4)
 
  		i2c@c240000 {
  			status = "okay";
+
  			typec@8 {
  				compatible = "cypress,cypd4226";
  				reg = <0x08>;
@@ -2254,22 +2255,27 @@ typec@8 {
  				interrupts = <TEGRA234_MAIN_GPIO(Y, 4) IRQ_TYPE_LEVEL_LOW>;
  				firmware-name = "nvidia,jetson-agx-xavier";
  				status = "okay";
+
  				#address-cells = <1>;
  				#size-cells = <0>;
+
  				ccg_typec_con0: connector@0 {
  					compatible = "usb-c-connector";
  					reg = <0>;
  					label = "USB-C";
  					data-role = "host";
+
  					ports {
  						#address-cells = <1>;
  						#size-cells = <0>;
+
  						port@0 {
  							reg = <0>;
  							hs_ucsi_ccg_p0: endpoint {
  								remote-endpoint = <&hs_typec_p0>;
  							};
  						};
+
  						port@1 {
  							reg = <1>;
  							ss_ucsi_ccg_p0: endpoint {
@@ -2278,20 +2284,24 @@ ss_ucsi_ccg_p0: endpoint {
  						};
  					};
  				};
+
  				ccg_typec_con1: connector@1 {
  					compatible = "usb-c-connector";
  					reg = <1>;
  					label = "USB-C";
  					data-role = "dual";
+
  					ports {
  						#address-cells = <1>;
  						#size-cells = <0>;
+

arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts ss_ucsi_ccg_p0: endpoint { · line 2307

Quoted 10 lines
arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts +1 -0
  						port@0 {
  							reg = <0>;
  							hs_ucsi_ccg_p1: endpoint {
  								remote-endpoint = <&hs_typec_p1>;
  							};
  						};
+
  						port@1 {
  							reg = <1>;
  							ss_ucsi_ccg_p1: endpoint {

Jon

Signature · 1 line
nvpublic
maintainer Acked-by on v1 1/2
#3 lore raw
In reply to Thierry Reding
Quoted 16 lines · Thierry Reding

From: Thierry Reding <[email protected]>

We typically sort the "compatible" property first because it defines what the remainder of the properties can be. For the sound node on the Jetson AGX Orin this wasn't done, so fix that up.

---
  arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts +0 -0
index ac64dac287de..e499010fc673 100644

arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts serial { · line 2352

Quoted 10 lines
arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts +1 -2
@@ -2345,9 +2345,8 @@ serial {
  	};
 
  	sound {
-		status = "okay";
-
  		compatible = "nvidia,tegra186-audio-graph-card";
+		status = "okay";
 
  		dais = /* ADMAIF (FE) Ports */
  		       <&admaif0_port>, <&admaif1_port>, <&admaif2_port>, <&admaif3_port>,

Jon

Signature · 1 line
nvpublic