Skip to contentSkip to conversation

ARM: ux500: DT: Rename root node "soc-u9500" into "soc-ux500"

PATCH Superseded Linus Walleij 3 participants 3 messages Apr 15, 2013 Device tree bindings

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: ux500: DT: Rename root node "soc-u9500" into "soc-ux500"

From: Gabriel Fernandez <[email protected]>

This root node is used in the whole family of chips, the a9500 is just one particular instance.

---
 arch/arm/boot/dts/ccu9540.dts     | 2 +-
 arch/arm/boot/dts/dbx5x0.dtsi     | 2 +-
 arch/arm/boot/dts/href.dtsi       | 2 +-
 arch/arm/boot/dts/hrefprev60.dts  | 2 +-
 arch/arm/boot/dts/hrefv60plus.dts | 2 +-
 arch/arm/boot/dts/snowball.dts    | 2 +-
 arch/arm/boot/dts/stuib.dtsi      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/ccu9540.dts +1 -1
index 0430546..bd69305 100644
@@ -20,7 +20,7 @@
 		reg = <0x00000000 0x20000000>;
 	};
 
-	soc-u9500 {
+	soc-ux500 {
 		uart at 80120000 {
 			status = "okay";
 		};
arch/arm/boot/dts/dbx5x0.dtsi +1 -1
index d765c38..76eba0a 100644
@@ -12,7 +12,7 @@
 /include/ "skeleton.dtsi"
 
 / {
-	soc-u9500 {
+	soc-ux500 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "stericsson,db8500";
arch/arm/boot/dts/href.dtsi +1 -1
index f2c0f66..527755f 100644
@@ -27,7 +27,7 @@
 		};
 	};
 
-	soc-u9500 {
+	soc-ux500 {
 		uart at 80120000 {
 			status = "okay";
 		};
arch/arm/boot/dts/hrefprev60.dts +1 -1
index c2d2748..3d4a64e 100644
@@ -24,7 +24,7 @@
 		};
 	};
 
-	soc-u9500 {
+	soc-ux500 {
 		prcmu at 80157000 {
 			ab8500 at 5 {
 				ab8500-gpio {
arch/arm/boot/dts/hrefv60plus.dts +1 -1
index 55f4191..916bb91 100644
@@ -24,7 +24,7 @@
 		};
 	};
 
-	soc-u9500 {
+	soc-ux500 {
 		i2c at 80110000 {
 			bu21013_tp at 0x5c {
 				reset-gpio = <&gpio4 15 0x4>;
arch/arm/boot/dts/snowball.dts +1 -1
index 5fcd7a8..4bb8f11 100644
@@ -82,7 +82,7 @@
 		};
 	};
 
-	soc-u9500 {
+	soc-ux500 {
 
 		sound {
 			compatible = "stericsson,snd-soc-mop500";
arch/arm/boot/dts/stuib.dtsi +1 -1
index 615392a..1be4ec9 100644
@@ -10,7 +10,7 @@
  */
 
 / {
-	soc-u9500 {
+	soc-ux500 {
 		i2c at 80004000 {
 			stmpe1601: stmpe1601 at 40 {
 				compatible = "st,stmpe1601";
Signature · 1 line
1.7.11.3
#1 lore raw

PATCH 1/1 ARM: ux500: DT: Rename root node "soc-u9500" into "soc-ux500"

Quoted 9 lines · Linus Walleij

From: Gabriel Fernandez <[email protected]>

This root node is used in the whole family of chips, the a9500 is just one particular instance.

Looks good to me:

Quoted 100 lines
 arch/arm/boot/dts/ccu9540.dts     | 2 +-
 arch/arm/boot/dts/dbx5x0.dtsi     | 2 +-
 arch/arm/boot/dts/href.dtsi       | 2 +-
 arch/arm/boot/dts/hrefprev60.dts  | 2 +-
 arch/arm/boot/dts/hrefv60plus.dts | 2 +-
 arch/arm/boot/dts/snowball.dts    | 2 +-
 arch/arm/boot/dts/stuib.dtsi      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/ccu9540.dts +1 -1
index 0430546..bd69305 100644
@@ -20,7 +20,7 @@
 		reg = <0x00000000 0x20000000>;
 	};
 
-	soc-u9500 {
+	soc-ux500 {
 		uart at 80120000 {
 			status = "okay";
 		};
arch/arm/boot/dts/dbx5x0.dtsi +1 -1
index d765c38..76eba0a 100644
@@ -12,7 +12,7 @@
 /include/ "skeleton.dtsi"
 
 / {
-	soc-u9500 {
+	soc-ux500 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "stericsson,db8500";
arch/arm/boot/dts/href.dtsi +1 -1
index f2c0f66..527755f 100644
@@ -27,7 +27,7 @@
 		};
 	};
 
-	soc-u9500 {
+	soc-ux500 {
 		uart at 80120000 {
 			status = "okay";
 		};
arch/arm/boot/dts/hrefprev60.dts +1 -1
index c2d2748..3d4a64e 100644
@@ -24,7 +24,7 @@
 		};
 	};
 
-	soc-u9500 {
+	soc-ux500 {
 		prcmu at 80157000 {
 			ab8500 at 5 {
 				ab8500-gpio {
arch/arm/boot/dts/hrefv60plus.dts +1 -1
index 55f4191..916bb91 100644
@@ -24,7 +24,7 @@
 		};
 	};
 
-	soc-u9500 {
+	soc-ux500 {
 		i2c at 80110000 {
 			bu21013_tp at 0x5c {
 				reset-gpio = <&gpio4 15 0x4>;
arch/arm/boot/dts/snowball.dts +1 -1
index 5fcd7a8..4bb8f11 100644
@@ -82,7 +82,7 @@
 		};
 	};
 
-	soc-u9500 {
+	soc-ux500 {
 
 		sound {
 			compatible = "stericsson,snd-soc-mop500";
arch/arm/boot/dts/stuib.dtsi +1 -1
index 615392a..1be4ec9 100644
@@ -10,7 +10,7 @@
  */
 
 / {
-	soc-u9500 {
+	soc-ux500 {
 		i2c at 80004000 {
 			stmpe1601: stmpe1601 at 40 {
 				compatible = "st,stmpe1601";
Signature · 4 lines
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#2 lore raw

PATCH 1/1 ARM: ux500: DT: Rename root node "soc-u9500" into "soc-ux500"

In reply to Linus Walleij

arch/arm/boot/dts/ccu9540.dts line 23

Quoted 9 lines · Linus Walleij

From: Gabriel Fernandez <[email protected]>

This root node is used in the whole family of chips, the a9500 is just one particular instance.

arch/arm/boot/dts/ccu9540.dts +1 -1
 
-	soc-u9500 {
+	soc-ux500 {

Shouldn't this just be "soc" then; nodes are usually named based on type of object rather than identity.