mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] ARM: i.MX50: fix Kindle-MX50 DT issues and warnings
@ 2018-06-01  5:44 Alexander Kurz
  2018-06-04  6:59 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Alexander Kurz @ 2018-06-01  5:44 UTC (permalink / raw)
  To: barebox, Sascha Hauer; +Cc: Alexander Kurz

Fix warnings generated from the kindle-mx50 dts when used in linux with W=1:
unit names should not have leading "0x"; reg property given, but no unit name;
use stdout-path instead of linux,stdout-path.
Also move the regulator-fixed node to the root node to match the convention.

Signed-off-by: Alexander Kurz <akurz@blala.de>
---
 arch/arm/dts/imx50-kindle-common.dtsi | 31 ++++++++++++-------------------
 arch/arm/dts/imx50-kindle-d01100.dts  |  4 ++--
 arch/arm/dts/imx50-kindle-d01200.dts  |  4 ++--
 arch/arm/dts/imx50-kindle-ey21.dts    |  4 ++--
 4 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/arch/arm/dts/imx50-kindle-common.dtsi b/arch/arm/dts/imx50-kindle-common.dtsi
index 048e95389..92933e691 100644
--- a/arch/arm/dts/imx50-kindle-common.dtsi
+++ b/arch/arm/dts/imx50-kindle-common.dtsi
@@ -21,19 +21,12 @@
 	/* this is a dummy fixed-voltage "regulator", mainly to satisfy
 	* the esdhc implementation requiring vmmc-supply and vqmmc-supply
 	*/
-	regulators {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		reg_3p3v: regulator@0 {
-			compatible = "regulator-fixed";
-			reg = <0>;
-			regulator-name = "3P3V";
-			regulator-min-microvolt = <3300000>;
-			regulator-max-microvolt = <3300000>;
-			regulator-always-on;
-		};
+	reg_3p3v: regulator-3p3v {
+		compatible = "regulator-fixed";
+		regulator-name = "3P3V";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
 	};
 };
 
@@ -149,12 +142,12 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		kernel: kernel@0x41000 {
+		kernel: kernel@41000 {
 			label = "kernel";
 			reg = <0x41000 0xe00000>;
 		};
 
-		diags_kernel: diags_kernel@0xe41000 {
+		diags_kernel: diags_kernel@e41000 {
 			label = "diags_kernel";
 			reg = <0xe41000 0xe00000>;
 		};
@@ -165,17 +158,17 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		imx_header: imx_header@0x400 {
+		imx_header: imx_header@400 {
 			label = "imx_header";
 			reg = <0x400 0x800>;
 		};
 
-		self: self@0x1000 {
+		self: self@1000 {
 			label = "self";
 			reg = <0x1000 0x3e000>;
 		};
 
-		userdata: userdata@0x3f000 {
+		userdata: userdata@3f000 {
 			label = "userdata";
 			reg = <0x3f000 0x1400>;
 		};
@@ -306,7 +299,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			led-control = <0 0xff8 0 0>;
-			ledg {
+			ledg@2 {
 				reg = <2>;
 				label = "pmic_ledsg";
 				linux,default-trigger = "heartbeat";
diff --git a/arch/arm/dts/imx50-kindle-d01100.dts b/arch/arm/dts/imx50-kindle-d01100.dts
index 55171d7f2..bfec71910 100644
--- a/arch/arm/dts/imx50-kindle-d01100.dts
+++ b/arch/arm/dts/imx50-kindle-d01100.dts
@@ -20,10 +20,10 @@
 	compatible = "amazon,kindle-d01100", "fsl,imx50";
 
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 	};
 
-	memory {
+	memory@70000000 {
 		device_type = "memory";
 		reg = <0x70000000 0x10000000>;
 	};
diff --git a/arch/arm/dts/imx50-kindle-d01200.dts b/arch/arm/dts/imx50-kindle-d01200.dts
index cf65966a7..57eb9ba73 100644
--- a/arch/arm/dts/imx50-kindle-d01200.dts
+++ b/arch/arm/dts/imx50-kindle-d01200.dts
@@ -20,10 +20,10 @@
 	compatible = "amazon,kindle-d01200", "fsl,imx50";
 
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 	};
 
-	memory {
+	memory@70000000 {
 		device_type = "memory";
 		reg = <0x70000000 0x10000000>;
 	};
diff --git a/arch/arm/dts/imx50-kindle-ey21.dts b/arch/arm/dts/imx50-kindle-ey21.dts
index 3b8b5d8fc..603f6bead 100644
--- a/arch/arm/dts/imx50-kindle-ey21.dts
+++ b/arch/arm/dts/imx50-kindle-ey21.dts
@@ -20,10 +20,10 @@
 	compatible = "amazon,kindle-ey21", "fsl,imx50";
 
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 	};
 
-	memory {
+	memory@70000000 {
 		device_type = "memory";
 		reg = <0x70000000 0x10000000>;
 	};
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] ARM: i.MX50: fix Kindle-MX50 DT issues and warnings
  2018-06-01  5:44 [PATCH] ARM: i.MX50: fix Kindle-MX50 DT issues and warnings Alexander Kurz
@ 2018-06-04  6:59 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2018-06-04  6:59 UTC (permalink / raw)
  To: Alexander Kurz; +Cc: barebox

On Fri, Jun 01, 2018 at 05:44:09AM +0000, Alexander Kurz wrote:
> Fix warnings generated from the kindle-mx50 dts when used in linux with W=1:
> unit names should not have leading "0x"; reg property given, but no unit name;
> use stdout-path instead of linux,stdout-path.
> Also move the regulator-fixed node to the root node to match the convention.
> 
> Signed-off-by: Alexander Kurz <akurz@blala.de>
> ---
>  arch/arm/dts/imx50-kindle-common.dtsi | 31 ++++++++++++-------------------
>  arch/arm/dts/imx50-kindle-d01100.dts  |  4 ++--
>  arch/arm/dts/imx50-kindle-d01200.dts  |  4 ++--
>  arch/arm/dts/imx50-kindle-ey21.dts    |  4 ++--
>  4 files changed, 18 insertions(+), 25 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/arch/arm/dts/imx50-kindle-common.dtsi b/arch/arm/dts/imx50-kindle-common.dtsi
> index 048e95389..92933e691 100644
> --- a/arch/arm/dts/imx50-kindle-common.dtsi
> +++ b/arch/arm/dts/imx50-kindle-common.dtsi
> @@ -21,19 +21,12 @@
>  	/* this is a dummy fixed-voltage "regulator", mainly to satisfy
>  	* the esdhc implementation requiring vmmc-supply and vqmmc-supply
>  	*/
> -	regulators {
> -		compatible = "simple-bus";
> -		#address-cells = <1>;
> -		#size-cells = <0>;
> -
> -		reg_3p3v: regulator@0 {
> -			compatible = "regulator-fixed";
> -			reg = <0>;
> -			regulator-name = "3P3V";
> -			regulator-min-microvolt = <3300000>;
> -			regulator-max-microvolt = <3300000>;
> -			regulator-always-on;
> -		};
> +	reg_3p3v: regulator-3p3v {
> +		compatible = "regulator-fixed";
> +		regulator-name = "3P3V";
> +		regulator-min-microvolt = <3300000>;
> +		regulator-max-microvolt = <3300000>;
> +		regulator-always-on;
>  	};
>  };
>  
> @@ -149,12 +142,12 @@
>  		#address-cells = <1>;
>  		#size-cells = <1>;
>  
> -		kernel: kernel@0x41000 {
> +		kernel: kernel@41000 {
>  			label = "kernel";
>  			reg = <0x41000 0xe00000>;
>  		};
>  
> -		diags_kernel: diags_kernel@0xe41000 {
> +		diags_kernel: diags_kernel@e41000 {
>  			label = "diags_kernel";
>  			reg = <0xe41000 0xe00000>;
>  		};
> @@ -165,17 +158,17 @@
>  		#address-cells = <1>;
>  		#size-cells = <1>;
>  
> -		imx_header: imx_header@0x400 {
> +		imx_header: imx_header@400 {
>  			label = "imx_header";
>  			reg = <0x400 0x800>;
>  		};
>  
> -		self: self@0x1000 {
> +		self: self@1000 {
>  			label = "self";
>  			reg = <0x1000 0x3e000>;
>  		};
>  
> -		userdata: userdata@0x3f000 {
> +		userdata: userdata@3f000 {
>  			label = "userdata";
>  			reg = <0x3f000 0x1400>;
>  		};
> @@ -306,7 +299,7 @@
>  			#address-cells = <1>;
>  			#size-cells = <0>;
>  			led-control = <0 0xff8 0 0>;
> -			ledg {
> +			ledg@2 {
>  				reg = <2>;
>  				label = "pmic_ledsg";
>  				linux,default-trigger = "heartbeat";
> diff --git a/arch/arm/dts/imx50-kindle-d01100.dts b/arch/arm/dts/imx50-kindle-d01100.dts
> index 55171d7f2..bfec71910 100644
> --- a/arch/arm/dts/imx50-kindle-d01100.dts
> +++ b/arch/arm/dts/imx50-kindle-d01100.dts
> @@ -20,10 +20,10 @@
>  	compatible = "amazon,kindle-d01100", "fsl,imx50";
>  
>  	chosen {
> -		linux,stdout-path = &uart1;
> +		stdout-path = &uart1;
>  	};
>  
> -	memory {
> +	memory@70000000 {
>  		device_type = "memory";
>  		reg = <0x70000000 0x10000000>;
>  	};
> diff --git a/arch/arm/dts/imx50-kindle-d01200.dts b/arch/arm/dts/imx50-kindle-d01200.dts
> index cf65966a7..57eb9ba73 100644
> --- a/arch/arm/dts/imx50-kindle-d01200.dts
> +++ b/arch/arm/dts/imx50-kindle-d01200.dts
> @@ -20,10 +20,10 @@
>  	compatible = "amazon,kindle-d01200", "fsl,imx50";
>  
>  	chosen {
> -		linux,stdout-path = &uart1;
> +		stdout-path = &uart1;
>  	};
>  
> -	memory {
> +	memory@70000000 {
>  		device_type = "memory";
>  		reg = <0x70000000 0x10000000>;
>  	};
> diff --git a/arch/arm/dts/imx50-kindle-ey21.dts b/arch/arm/dts/imx50-kindle-ey21.dts
> index 3b8b5d8fc..603f6bead 100644
> --- a/arch/arm/dts/imx50-kindle-ey21.dts
> +++ b/arch/arm/dts/imx50-kindle-ey21.dts
> @@ -20,10 +20,10 @@
>  	compatible = "amazon,kindle-ey21", "fsl,imx50";
>  
>  	chosen {
> -		linux,stdout-path = &uart1;
> +		stdout-path = &uart1;
>  	};
>  
> -	memory {
> +	memory@70000000 {
>  		device_type = "memory";
>  		reg = <0x70000000 0x10000000>;
>  	};
> -- 
> 2.11.0
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-06-04  6:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-01  5:44 [PATCH] ARM: i.MX50: fix Kindle-MX50 DT issues and warnings Alexander Kurz
2018-06-04  6:59 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox