Skip to contentSkip to conversation

ARM: dts: imx: Pass a label to the soc node

PATCH Applied Fabio Estevam 2 participants 3 messages Jun 14, 2022 – Jun 20, 2022

Subsystems (2)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/2 ARM: dts: imx: Pass a label to the soc node

From: Fabio Estevam <[email protected]>

Pass a label to the 'soc' node to make it easier to reference it from other devicetree files.

U-Boot, for example usually needs to access the AIPS node to pass U-Boot-specific properties.

---
 arch/arm/boot/dts/imx25.dtsi   | 2 +-
 arch/arm/boot/dts/imx27.dtsi   | 2 +-
 arch/arm/boot/dts/imx31.dtsi   | 2 +-
 arch/arm/boot/dts/imx50.dtsi   | 2 +-
 arch/arm/boot/dts/imx51.dtsi   | 2 +-
 arch/arm/boot/dts/imx53.dtsi   | 2 +-
 arch/arm/boot/dts/imx6dl.dtsi  | 2 +-
 arch/arm/boot/dts/imx6q.dtsi   | 2 +-
 arch/arm/boot/dts/imx6qdl.dtsi | 2 +-
 arch/arm/boot/dts/imx6sx.dtsi  | 2 +-
 arch/arm/boot/dts/imx6ul.dtsi  | 2 +-
 arch/arm/boot/dts/imx6ull.dtsi | 2 +-
 arch/arm/boot/dts/imx7d.dtsi   | 2 +-
 arch/arm/boot/dts/imx7s.dtsi   | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)
arch/arm/boot/dts/imx25.dtsi +1 -1
index fa8044c21cb8..bc4de0c05511 100644
@@ -68,7 +68,7 @@ osc {
 		};
 	};
 
-	soc {
+	soc: soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "simple-bus";
arch/arm/boot/dts/imx27.dtsi +1 -1
index b660c7d05584..6270685a1397 100644
@@ -74,7 +74,7 @@ cpu: cpu@0 {
 		};
 	};
 
-	soc {
+	soc: soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "simple-bus";
arch/arm/boot/dts/imx31.dtsi +1 -1
index 2adb923c0b27..b5ece07e78d5 100644
@@ -48,7 +48,7 @@ avic: interrupt-controller@68000000 {
 		reg = <0x68000000 0x100000>;
 	};
 
-	soc {
+	soc: soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "simple-bus";
arch/arm/boot/dts/imx50.dtsi +1 -1
index be0de0fd31f9..440909068e11 100644
@@ -94,7 +94,7 @@ usbphy0: usbphy-0 {
 		status = "okay";
 	};
 
-	soc {
+	soc: soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "simple-bus";
arch/arm/boot/dts/imx51.dtsi +1 -1
index 1e20a6639e42..a6d8a606bc48 100644
@@ -114,7 +114,7 @@ display-subsystem {
 		ports = <&ipu_di0>, <&ipu_di1>;
 	};
 
-	soc {
+	soc: soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "simple-bus";
arch/arm/boot/dts/imx53.dtsi +1 -1
index 67487f3caee1..b183bbe4efd3 100644
@@ -132,7 +132,7 @@ usbphy1: usbphy-1 {
 		status = "okay";
 	};
 
-	soc {
+	soc: soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "simple-bus";
arch/arm/boot/dts/imx6dl.dtsi +1 -1
index fdd81fdc3f35..8e0ed209ede0 100644
@@ -80,7 +80,7 @@ cpu@1 {
 		};
 	};
 
-	soc {
+	soc: soc {
 		ocram: sram@900000 {
 			compatible = "mmio-sram";
 			reg = <0x00900000 0x20000>;
arch/arm/boot/dts/imx6q.dtsi +1 -1
index 9caba4529c71..92084420e321 100644
@@ -159,7 +159,7 @@ cpu3: cpu@3 {
 		};
 	};
 
-	soc {
+	soc: soc {
 		ocram: sram@900000 {
 			compatible = "mmio-sram";
 			reg = <0x00900000 0x40000>;
arch/arm/boot/dts/imx6qdl.dtsi +1 -1
index 652feff33496..d9f9c89a6458 100644
@@ -143,7 +143,7 @@ usbphynop2: usbphynop2 {
 		#phy-cells = <0>;
 	};
 
-	soc {
+	soc: soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "simple-bus";
arch/arm/boot/dts/imx6sx.dtsi +1 -1
index fc6334336b3d..4d075e2bf749 100644
@@ -154,7 +154,7 @@ usbphynop1: usbphynop1 {
 		#phy-cells = <0>;
 	};
 
-	soc {
+	soc: soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "simple-bus";
arch/arm/boot/dts/imx6ul.dtsi +1 -1
index 799d8d065731..ecc307360957 100644
@@ -139,7 +139,7 @@ pmu {
 		interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
-	soc {
+	soc: soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "simple-bus";
arch/arm/boot/dts/imx6ull.dtsi +1 -1
index 9bf67490ac49..2bccd45e9fc2 100644
@@ -50,7 +50,7 @@ &usdhc2 {
 };
 
 / {
-	soc {
+	soc: soc {
 		aips3: bus@2200000 {
 			compatible = "fsl,aips-bus", "simple-bus";
 			#address-cells = <1>;
arch/arm/boot/dts/imx7d.dtsi +1 -1
index f8cba47536a0..7ceb7c09f7ad 100644
@@ -78,7 +78,7 @@ usbphynop2: usbphynop2 {
 		#phy-cells = <0>;
 	};
 
-	soc {
+	soc: soc {
 		etm@3007d000 {
 			compatible = "arm,coresight-etm3x", "arm,primecell";
 			reg = <0x3007d000 0x1000>;
arch/arm/boot/dts/imx7s.dtsi +1 -1
index 039eed79d2e7..29148285f9fc 100644
@@ -176,7 +176,7 @@ timer {
 			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>;
 	};
 
-	soc {
+	soc: soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "simple-bus";
Signature · 7 lines
2.25.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author reviewer
#1 lore raw

PATCH 2/2 ARM: dts: imx: Pass a label to the AIPS nodes

From: Fabio Estevam <[email protected]>

Pass a label to the AIPS nodes to make it easier to reference it from other devicetree files.

Some i.MX dtsi files already describe labels for the AIPS nodes.

Make it available for all SoCs for consistency.

U-Boot, for example usually needs to access the AIPS node to pass U-Boot-specific properties.

---
 arch/arm/boot/dts/imx27.dtsi   | 4 ++--
 arch/arm/boot/dts/imx31.dtsi   | 2 +-
 arch/arm/boot/dts/imx50.dtsi   | 4 ++--
 arch/arm/boot/dts/imx51.dtsi   | 4 ++--
 arch/arm/boot/dts/imx53.dtsi   | 4 ++--
 arch/arm/boot/dts/imx6q.dtsi   | 2 +-
 arch/arm/boot/dts/imx6qdl.dtsi | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)
arch/arm/boot/dts/imx27.dtsi +2 -2
index 6270685a1397..e140307be2e7 100644
@@ -81,7 +81,7 @@ soc: soc {
 		interrupt-parent = <&aitc>;
 		ranges;
 
-		aipi@10000000 { /* AIPI1 */
+		aipi1: aipi@10000000 { /* AIPI1 */
 			compatible = "fsl,aipi-bus", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
@@ -453,7 +453,7 @@ gpt6: timer@1001f000 {
 			};
 		};
 
-		aipi@10020000 { /* AIPI2 */
+		aipi2: aipi@10020000 { /* AIPI2 */
 			compatible = "fsl,aipi-bus", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
arch/arm/boot/dts/imx31.dtsi +1 -1
index b5ece07e78d5..5c4938b0d5a1 100644
@@ -63,7 +63,7 @@ iram: sram@1fffc000 {
 			ranges = <0 0x1fffc000 0x4000>;
 		};
 
-		bus@43f00000 { /* AIPS1 */
+		aips1: bus@43f00000 { /* AIPS1 */
 			compatible = "fsl,aips-bus", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
arch/arm/boot/dts/imx50.dtsi +2 -2
index 440909068e11..c0c7575fbecf 100644
@@ -101,7 +101,7 @@ soc: soc {
 		interrupt-parent = <&tzic>;
 		ranges;
 
-		bus@50000000 { /* AIPS1 */
+		aips1: bus@50000000 { /* AIPS1 */
 			compatible = "fsl,aips-bus", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
@@ -385,7 +385,7 @@ uart4: serial@53ff0000 {
 			};
 		};
 
-		bus@60000000 {	/* AIPS2 */
+		aips2: bus@60000000 {	/* AIPS2 */
 			compatible = "fsl,aips-bus", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
arch/arm/boot/dts/imx51.dtsi +2 -2
index a6d8a606bc48..592d9c23a447 100644
@@ -171,7 +171,7 @@ ipu_di1_disp2: endpoint {
 			};
 		};
 
-		bus@70000000 { /* AIPS1 */
+		aips1: bus@70000000 { /* AIPS1 */
 			compatible = "fsl,aips-bus", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
@@ -460,7 +460,7 @@ clks: ccm@73fd4000{
 			};
 		};
 
-		bus@80000000 {	/* AIPS2 */
+		aips2: bus@80000000 {	/* AIPS2 */
 			compatible = "fsl,aips-bus", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
arch/arm/boot/dts/imx53.dtsi +2 -2
index b183bbe4efd3..b7a6469d3472 100644
@@ -222,7 +222,7 @@ gpu: gpu@30000000 {
 			clock-names = "core_clk", "mem_iface_clk";
 		};
 
-		bus@50000000 { /* AIPS1 */
+		aips1: bus@50000000 { /* AIPS1 */
 			compatible = "fsl,aips-bus", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
@@ -655,7 +655,7 @@ uart4: serial@53ff0000 {
 			};
 		};
 
-		bus@60000000 {	/* AIPS2 */
+		aips2: bus@60000000 {	/* AIPS2 */
 			compatible = "fsl,aips-bus", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
arch/arm/boot/dts/imx6q.dtsi +1 -1
index 92084420e321..3b77eae40e39 100644
@@ -166,7 +166,7 @@ ocram: sram@900000 {
 			clocks = <&clks IMX6QDL_CLK_OCRAM>;
 		};
 
-		bus@2000000 { /* AIPS1 */
+		aips1: bus@2000000 { /* AIPS1 */
 			spba-bus@2000000 {
 				ecspi5: spi@2018000 {
 					#address-cells = <1>;
arch/arm/boot/dts/imx6qdl.dtsi +2 -2
index d9f9c89a6458..4f7fefc14d0a 100644
@@ -290,7 +290,7 @@ pcie: pcie@1ffc000 {
 			status = "disabled";
 		};
 
-		bus@2000000 { /* AIPS1 */
+		aips1: bus@2000000 { /* AIPS1 */
 			compatible = "fsl,aips-bus", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
@@ -941,7 +941,7 @@ sdma: sdma@20ec000 {
 			};
 		};
 
-		bus@2100000 { /* AIPS2 */
+		aips2: bus@2100000 { /* AIPS2 */
 			compatible = "fsl,aips-bus", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
Signature · 7 lines
2.25.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Applied
#2 lore raw
In reply to Fabio Estevam
Quoted 9 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Pass a label to the 'soc' node to make it easier to reference it from other devicetree files.

U-Boot, for example usually needs to access the AIPS node to pass U-Boot-specific properties.

Applied both, thanks!

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel