ARM: dts: imx6: Pass memory unit-adress

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

Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name

There are cases where dts passes an empty memory node, 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>
Acked-By: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index 700e129d38656c9753d9f01d856268ad4112bd51..d565d321908783a4406cf0b07ba54786528580f1 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -54,8 +54,8 @@ / {
                     "fsl,imx6dl";
 
        /* Will be filled by the bootloader */
-       memory {
-               reg = <0 0>;
+       memory@10000000 {
+               reg = <0x10000000 0>;
        };
 
        aliases {

diff --git a/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts b/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts
index c195ad629024cebe9e09952b963f0201b5b09693..89384cb618f60f3c7cbb60106484db967fb20a67 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts
+++ b/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts
@@ -22,7 +22,7 @@ / {
        compatible = "dfi,fs700-m60-6dl", "dfi,fs700e-m60", "fsl,imx6dl";
 
        /* Will be filled by the bootloader */
-       memory {
-               reg = <0 0>;
+       memory@10000000 {
+               reg = <0x10000000 0>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6dl-ts4900.dts b/arch/arm/boot/dts/imx6dl-ts4900.dts
index e23f7891cf15b84d72540f51c62c924fb6c02d37..cc01a7a22e30850f25b56b77cfa26c40a23cee27 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-ts4900.dts
+++ b/arch/arm/boot/dts/imx6dl-ts4900.dts
@@ -48,7 +48,7 @@ / {
        compatible = "technologic,imx6dl-ts4900", "fsl,imx6dl";
 
        /* Will be filled by the bootloader */
-       memory {
-               reg = <0 0>;
+       memory@10000000 {
+               reg = <0x10000000 0>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6dl-ts7970.dts b/arch/arm/boot/dts/imx6dl-ts7970.dts
index cae3313201a1660b35662845bc2699c64e93f941..82435d5bf33f970cfee152b6f4c55413198c0229 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-ts7970.dts
+++ b/arch/arm/boot/dts/imx6dl-ts7970.dts
@@ -49,7 +49,7 @@ / {
        compatible = "technologic,imx6dl-ts7970", "fsl,imx6dl";
 
        /* Will be filled by the bootloader */
-       memory {
-               reg = <0 0>;
+       memory@10000000 {
+               reg = <0x10000000 0>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts b/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts
index a266fe6adaa34b1421c4ab8b45623c716f0d0248..ad12d76bbb89a31f8178bc93e487d68531cf6b01 100644 (file)
--- a/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts
+++ b/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts
@@ -22,7 +22,7 @@ / {
        compatible = "dfi,fs700-m60-6qd", "dfi,fs700e-m60", "fsl,imx6q";
 
        /* Will be filled by the bootloader */
-       memory {
-               reg = <0 0>;
+       memory@10000000 {
+               reg = <0x10000000 0>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-h100.dts b/arch/arm/boot/dts/imx6q-h100.dts
index dd24b465a4e5d7a833b6d7ce11fcbb95dccb875a..714e09e04dcb7d2558aee12a75837e5f0aa352ce 100644 (file)
--- a/arch/arm/boot/dts/imx6q-h100.dts
+++ b/arch/arm/boot/dts/imx6q-h100.dts
@@ -50,8 +50,8 @@ / {
        compatible = "auvidea,h100", "fsl,imx6q";
 
        /* Will be filled by the bootloader */
-       memory {
-               reg = <0 0>;
+       memory@10000000 {
+               reg = <0x10000000 0>;
        };
 
        aliases {

diff --git a/arch/arm/boot/dts/imx6q-novena.dts b/arch/arm/boot/dts/imx6q-novena.dts
index 43a0c32ea85f2e5c8fbee5198e5bf7e283f9f99b..52f39371188dfab69d5b991d6b2dadbe6c87fbae 100644 (file)
--- a/arch/arm/boot/dts/imx6q-novena.dts
+++ b/arch/arm/boot/dts/imx6q-novena.dts
@@ -56,8 +56,8 @@ / {
        compatible = "kosagi,imx6q-novena", "fsl,imx6q";
 
        /* Will be filled by the bootloader */
-       memory {
-               reg = <0 0>;
+       memory@10000000 {
+               reg = <0x10000000 0>;
        };
 
        chosen {

diff --git a/arch/arm/boot/dts/imx6q-ts4900.dts b/arch/arm/boot/dts/imx6q-ts4900.dts
index 9cf7b375588db8652c8a590fbd7c83374c43b848..e655107edc564e46e072bbedae388104ed8be4c0 100644 (file)
--- a/arch/arm/boot/dts/imx6q-ts4900.dts
+++ b/arch/arm/boot/dts/imx6q-ts4900.dts
@@ -48,8 +48,8 @@ / {
        compatible = "technologic,imx6q-ts4900", "fsl,imx6q";
 
        /* Will be filled by the bootloader */
-       memory {
-               reg = <0 0>;
+       memory@10000000 {
+               reg = <0x10000000 0>;
        };
 };
 

diff --git a/arch/arm/boot/dts/imx6q-ts7970.dts b/arch/arm/boot/dts/imx6q-ts7970.dts
index fd84fc53f1eabbdc24ffb03188f8153d8f36ee1c..c615ac4feede152a9e28d7ffaca443ed3609d7c6 100644 (file)
--- a/arch/arm/boot/dts/imx6q-ts7970.dts
+++ b/arch/arm/boot/dts/imx6q-ts7970.dts
@@ -49,8 +49,8 @@ / {
        compatible = "technologic,imx6q-ts7970", "fsl,imx6q";
 
        /* Will be filled by the bootloader */
-       memory {
-               reg = <0 0>;
+       memory@10000000 {
+               reg = <0x10000000 0>;
        };
 };
 

diff --git a/arch/arm/boot/dts/imx6q-zii-rdu2.dts b/arch/arm/boot/dts/imx6q-zii-rdu2.dts
index fe8b12f31a4c33c0a1d3f511b841086546664106..7da6dde9c8578ec54e2ebaf6d7f3c76ab3210b82 100644 (file)
--- a/arch/arm/boot/dts/imx6q-zii-rdu2.dts
+++ b/arch/arm/boot/dts/imx6q-zii-rdu2.dts
@@ -49,7 +49,7 @@ / {
        compatible = "zii,imx6q-zii-rdu2", "fsl,imx6q";
 
        /* Will be filled by the bootloader */
-       memory {
-               reg = <0 0>;
+       memory@10000000 {
+               reg = <0x10000000 0>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index bd658db01290ff3d463433ae6016399db85eafeb..8206683172d205ed9476096e8f97ba1dc162f540 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -48,8 +48,8 @@ / {
        compatible = "toradex,apalis_imx6q", "fsl,imx6q";
 
        /* Will be filled by the bootloader */
-       memory {
-               reg = <0 0>;
+       memory@10000000 {
+               reg = <0x10000000 0>;
        };
 
        backlight: backlight {

diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
index 4c5f5132345efb75ee991038f2400e1820ae3054..9332a31e6c8b9af02dc017afcdfe2f8d869aea6a 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
@@ -43,8 +43,8 @@
 
 / {
        /* Will be filled by the bootloader */
-       memory {
-               reg = <0 0>;
+       memory@10000000 {
+               reg = <0x10000000 0>;
        };
 
        ir_recv: ir-receiver {

diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
index 86abba0557284e883e2954aba8e1264f16df07b3..7e20b47de839b4c7923f1b9b24735260c8d39ae6 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
@@ -41,8 +41,8 @@
 
 / {
        /* Will be filled by the bootloader */
-       memory {
-               reg = <0 0>;
+       memory@10000000 {
+               reg = <0x10000000 0>;
        };
 
        chosen {

diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
index ee77e0b79b04a4074bd1082dde2246240016ac13..988a5be8aa6f55a3d73f7292803c02e70a86a1db 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
@@ -41,8 +41,8 @@
 
 / {
        /* Will be filled by the bootloader */
-       memory {
-               reg = <0 0>;
+       memory@10000000 {
+               reg = <0x10000000 0>;
        };
 
        chosen {

diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
index 6abb66cd7d4ac43ee9d837413f02c73f631a9885..f015e2d1cf353954b069a5b4cbfb40dd3188adc4 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
@@ -61,8 +61,8 @@ aliases {
                sdhc1 = &usdhc2;
        };
 
-       memory {
-               reg = <0 0>; /* will be filled by U-Boot */
+       memory@10000000 {
+               reg = <0x10000000 0>; /* will be filled by U-Boot */
        };
 
        clocks {

diff --git a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
index 96ab983918e406478229ac00234e2ca5ac20f40d..de5b50df833cd5c729ff022b804bd25356f7e0ef 100644 (file)
--- a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
+++ b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
@@ -49,7 +49,7 @@ / {
        compatible = "zii,imx6qp-zii-rdu2", "fsl,imx6qp";
 
        /* Will be filled by the bootloader */
-       memory {
-               reg = <0 0>;
+       memory@10000000 {
+               reg = <0x10000000 0>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
index 65111f9843f4eaf715f0446e6ba8f70389c38cc1..f678d18ad44ab2c31fd5da091e0a1c80ac08c565 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
@@ -70,8 +70,8 @@ chosen {
                stdout-path = &uart1;
        };
 
-       memory {
-               reg = <0 0>; /* will be filled by U-Boot */
+       memory@80000000 {
+               reg = <0x80000000 0>; /* will be filled by U-Boot */
        };
 
        clocks {

diff --git a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
index cfda666a34f411bade8601b7634196067d6fc359..10ab4697950f51e001a8c483e09e9c8cd0240c27 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
@@ -6,7 +6,7 @@
 #include "imx6ull-colibri.dtsi"
 
 / {
-       memory {
+       memory@80000000 {
                reg = <0x80000000 0x10000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
index f48291b7cbf0c9b64a92688571e049b77d634a5c..3dffbcd50bf682a452423f5137f441b612e65af2 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
@@ -6,7 +6,7 @@
 #include "imx6ull-colibri.dtsi"
 
 / {
-       memory {
+       memory@80000000 {
                reg = <0x80000000 0x20000000>;
        };