diff mbox

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

Message ID 1366022492-8701-1-git-send-email-linus.walleij@stericsson.com (mailing list archive)
State New, archived
Headers show

Commit Message

Linus Walleij April 15, 2013, 10:41 a.m. UTC
From: Gabriel Fernandez <gabriel.fernandez@stericsson.com>

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

Cc: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Gabriel Fernandez <gabriel.fernandez@stericsson.com>
Reviewed-by: Philippe Langlais <philippe.langlais@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 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(-)

Comments

Lee Jones April 15, 2013, 11 a.m. UTC | #1
On Mon, 15 Apr 2013, Linus Walleij wrote:

> From: Gabriel Fernandez <gabriel.fernandez@stericsson.com>
> 
> This root node is used in the whole family of chips, the a9500
> is just one particular instance.
> 
> Cc: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Gabriel Fernandez <gabriel.fernandez@stericsson.com>
> Reviewed-by: Philippe Langlais <philippe.langlais@stericsson.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>


Looks good to me:

Acked-by: Lee Jones <lee.jones@linaro.org>

>  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(-)
> 
> diff --git a/arch/arm/boot/dts/ccu9540.dts b/arch/arm/boot/dts/ccu9540.dts
> index 0430546..bd69305 100644
> --- a/arch/arm/boot/dts/ccu9540.dts
> +++ b/arch/arm/boot/dts/ccu9540.dts
> @@ -20,7 +20,7 @@
>  		reg = <0x00000000 0x20000000>;
>  	};
>  
> -	soc-u9500 {
> +	soc-ux500 {
>  		uart@80120000 {
>  			status = "okay";
>  		};
> diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
> index d765c38..76eba0a 100644
> --- a/arch/arm/boot/dts/dbx5x0.dtsi
> +++ b/arch/arm/boot/dts/dbx5x0.dtsi
> @@ -12,7 +12,7 @@
>  /include/ "skeleton.dtsi"
>  
>  / {
> -	soc-u9500 {
> +	soc-ux500 {
>  		#address-cells = <1>;
>  		#size-cells = <1>;
>  		compatible = "stericsson,db8500";
> diff --git a/arch/arm/boot/dts/href.dtsi b/arch/arm/boot/dts/href.dtsi
> index f2c0f66..527755f 100644
> --- a/arch/arm/boot/dts/href.dtsi
> +++ b/arch/arm/boot/dts/href.dtsi
> @@ -27,7 +27,7 @@
>  		};
>  	};
>  
> -	soc-u9500 {
> +	soc-ux500 {
>  		uart@80120000 {
>  			status = "okay";
>  		};
> diff --git a/arch/arm/boot/dts/hrefprev60.dts b/arch/arm/boot/dts/hrefprev60.dts
> index c2d2748..3d4a64e 100644
> --- a/arch/arm/boot/dts/hrefprev60.dts
> +++ b/arch/arm/boot/dts/hrefprev60.dts
> @@ -24,7 +24,7 @@
>  		};
>  	};
>  
> -	soc-u9500 {
> +	soc-ux500 {
>  		prcmu@80157000 {
>  			ab8500@5 {
>  				ab8500-gpio {
> diff --git a/arch/arm/boot/dts/hrefv60plus.dts b/arch/arm/boot/dts/hrefv60plus.dts
> index 55f4191..916bb91 100644
> --- a/arch/arm/boot/dts/hrefv60plus.dts
> +++ b/arch/arm/boot/dts/hrefv60plus.dts
> @@ -24,7 +24,7 @@
>  		};
>  	};
>  
> -	soc-u9500 {
> +	soc-ux500 {
>  		i2c@80110000 {
>  			bu21013_tp@0x5c {
>  				reset-gpio = <&gpio4 15 0x4>;
> diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
> index 5fcd7a8..4bb8f11 100644
> --- a/arch/arm/boot/dts/snowball.dts
> +++ b/arch/arm/boot/dts/snowball.dts
> @@ -82,7 +82,7 @@
>  		};
>  	};
>  
> -	soc-u9500 {
> +	soc-ux500 {
>  
>  		sound {
>  			compatible = "stericsson,snd-soc-mop500";
> diff --git a/arch/arm/boot/dts/stuib.dtsi b/arch/arm/boot/dts/stuib.dtsi
> index 615392a..1be4ec9 100644
> --- a/arch/arm/boot/dts/stuib.dtsi
> +++ b/arch/arm/boot/dts/stuib.dtsi
> @@ -10,7 +10,7 @@
>   */
>  
>  / {
> -	soc-u9500 {
> +	soc-ux500 {
>  		i2c@80004000 {
>  			stmpe1601: stmpe1601@40 {
>  				compatible = "st,stmpe1601";
Stephen Warren April 15, 2013, 4:32 p.m. UTC | #2
On 04/15/2013 04:41 AM, Linus Walleij wrote:
> From: Gabriel Fernandez <gabriel.fernandez@stericsson.com>
> 
> This root node is used in the whole family of chips, the a9500
> is just one particular instance.

> diff --git a/arch/arm/boot/dts/ccu9540.dts b/arch/arm/boot/dts/ccu9540.dts

> -	soc-u9500 {
> +	soc-ux500 {

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

Patch

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