[PATCH] ARM: dts: mx5: Pass the memory unit-address

[PATCH] ARM: dts: mx5: Pass the memory unit-address

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@nxp.com>

Pass the memory unit-address to fix the following build warnings with W=1:

arch/arm/boot/dts/imx51-zii-rdu1.dtb: Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name
arch/arm/boot/dts/imx53-tx53-x03x.dtb: Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name
arch/arm/boot/dts/imx53-tx53-x13x.dtb: Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name

In theses cases an empty memory node is passed, which will be filled
by the bootloader. Passing the memory base address still allows the
bootloader to fill the memory size.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
 arch/arm/boot/dts/imx51-zii-rdu1.dts | 4 ++--
 arch/arm/boot/dts/imx53-tx53.dtsi    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts
index aa36204..14f4d57 100644
--- a/arch/arm/boot/dts/imx51-zii-rdu1.dts
+++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts
@@ -52,8 +52,8 @@
 	};
 
 	/* Will be filled by the bootloader */
-	memory {
-		reg = <0 0>;
+	memory at 90000000 {
+		reg = <0x90000000 0>;
 	};
 
 	aliases {
diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi
index e77dd0a..69a2af7 100644
--- a/arch/arm/boot/dts/imx53-tx53.dtsi
+++ b/arch/arm/boot/dts/imx53-tx53.dtsi
@@ -50,8 +50,8 @@
 	compatible = "karo,tx53", "fsl,imx53";
 
 	/* Will be filled by the bootloader */
-	memory {
-		reg = <0 0>;
+	memory at 70000000 {
+		reg = <0x70000000 0>;
 	};
 
 	aliases {
-- 
2.7.4

[PATCH] ARM: dts: mx5: Pass the memory unit-address

[Shawn Guo]

On Tue, Feb 27, 2018 at 11:13:35PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
> 
> Pass the memory unit-address to fix the following build warnings with W=1:
> 
> arch/arm/boot/dts/imx51-zii-rdu1.dtb: Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name
> arch/arm/boot/dts/imx53-tx53-x03x.dtb: Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name
> arch/arm/boot/dts/imx53-tx53-x13x.dtb: Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name
> 
> In theses cases an empty memory node is passed, which will be filled
> by the bootloader. Passing the memory base address still allows the
> bootloader to fill the memory size.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>

One thing I'm unsure is which memory node will be fixed up with correct
memory configuration, considering we will have two memory nodes.  One is
the following that defined in imx51.dtsi.

 memory { device_type = "memory"; };

And the other is memory at 90000000.

Shawn

> ---
>  arch/arm/boot/dts/imx51-zii-rdu1.dts | 4 ++--
>  arch/arm/boot/dts/imx53-tx53.dtsi    | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts
> index aa36204..14f4d57 100644
> --- a/arch/arm/boot/dts/imx51-zii-rdu1.dts
> +++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts
> @@ -52,8 +52,8 @@
>  	};
>  
>  	/* Will be filled by the bootloader */
> -	memory {
> -		reg = <0 0>;
> +	memory at 90000000 {
> +		reg = <0x90000000 0>;
>  	};
>  
>  	aliases {
> diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi
> index e77dd0a..69a2af7 100644
> --- a/arch/arm/boot/dts/imx53-tx53.dtsi
> +++ b/arch/arm/boot/dts/imx53-tx53.dtsi
> @@ -50,8 +50,8 @@
>  	compatible = "karo,tx53", "fsl,imx53";
>  
>  	/* Will be filled by the bootloader */
> -	memory {
> -		reg = <0 0>;
> +	memory at 70000000 {
> +		reg = <0x70000000 0>;
>  	};
>  
>  	aliases {
> -- 
> 2.7.4
> 

[PATCH] ARM: dts: mx5: Pass the memory unit-address

[Fabio Estevam]

Hi Shawn,

On Wed, Feb 28, 2018 at 12:03 AM, Shawn Guo <shawnguo@kernel.org> wrote:

> One thing I'm unsure is which memory node will be fixed up with correct
> memory configuration, considering we will have two memory nodes.  One is
> the following that defined in imx51.dtsi.
>
>  memory { device_type = "memory"; };
>
> And the other is memory at 90000000.

On my tests the correct memory@ is filled with the real memory size.

One further cleanup I can make to avoid this double memory node is:

--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -20,6 +20,7 @@
        };

        memory at 10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index c003e62..f3376f0 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -23,7 +23,6 @@
         * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; };

        aliases {
                ethernet0 = &fec;

If you agree I can do this for all i.MX dts.

What do you think?

[PATCH] ARM: dts: mx5: Pass the memory unit-address

[Shawn Guo]

On Wed, Feb 28, 2018 at 09:00:50AM -0300, Fabio Estevam wrote:
> Hi Shawn,
> 
> On Wed, Feb 28, 2018 at 12:03 AM, Shawn Guo <shawnguo@kernel.org> wrote:
> 
> > One thing I'm unsure is which memory node will be fixed up with correct
> > memory configuration, considering we will have two memory nodes.  One is
> > the following that defined in imx51.dtsi.
> >
> >  memory { device_type = "memory"; };
> >
> > And the other is memory at 90000000.
> 
> On my tests the correct memory@ is filled with the real memory size.
> 
> One further cleanup I can make to avoid this double memory node is:
> 
> --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> @@ -20,6 +20,7 @@
>         };
> 
>         memory at 10000000 {
> +               device_type = "memory";
>                 reg = <0x10000000 0x40000000>;
>         };
> 
> diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
> index c003e62..f3376f0 100644
> --- a/arch/arm/boot/dts/imx6qdl.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl.dtsi
> @@ -23,7 +23,6 @@
>          * Also for U-Boot there must be a pre-existing /memory node.
>          */
>         chosen {};
> -       memory { device_type = "memory"; };
> 
>         aliases {
>                 ethernet0 = &fec;
> 
> If you agree I can do this for all i.MX dts.
> 
> What do you think?

I agree.  In the end, we will need to have every single board DTS
contain a memory at unit-address node.  Although the size field can be
dummy and fixed up by bootloader.

Shawn

[PATCH] ARM: dts: mx5: Pass the memory unit-address

[Shawn Guo]

On Tue, Feb 27, 2018 at 11:13:35PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
> 
> Pass the memory unit-address to fix the following build warnings with W=1:
> 
> arch/arm/boot/dts/imx51-zii-rdu1.dtb: Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name
> arch/arm/boot/dts/imx53-tx53-x03x.dtb: Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name
> arch/arm/boot/dts/imx53-tx53-x13x.dtb: Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name
> 
> In theses cases an empty memory node is passed, which will be filled
> by the bootloader. Passing the memory base address still allows the
> bootloader to fill the memory size.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>

s/mx5/imx5 in subject.

I fixed it up and applied the patch.

Shawn