From: Fabio Estevam Date: Thu, 22 Feb 2018 17:16:35 +0000 (-0300) Subject: ARM: dts: imx6: Pass memory unit-adress X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=edc05819786fd5eee330b89bd5892dad1199effc;p=linux.git 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 Acked-By: Lothar Waßmann Signed-off-by: Shawn Guo --- diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts index 700e129d38656..d565d32190878 100644 --- 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 c195ad629024c..89384cb618f60 100644 --- 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 e23f7891cf15b..cc01a7a22e308 100644 --- 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 cae3313201a16..82435d5bf33f9 100644 --- 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 a266fe6adaa34..ad12d76bbb89a 100644 --- 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 dd24b465a4e5d..714e09e04dcb7 100644 --- 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 43a0c32ea85f2..52f39371188df 100644 --- 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 9cf7b375588db..e655107edc564 100644 --- 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 fd84fc53f1eab..c615ac4feede1 100644 --- 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 fe8b12f31a4c3..7da6dde9c8578 100644 --- 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 bd658db01290f..8206683172d20 100644 --- 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 4c5f5132345ef..9332a31e6c8b9 100644 --- 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 86abba0557284..7e20b47de839b 100644 --- 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 ee77e0b79b04a..988a5be8aa6f5 100644 --- 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 6abb66cd7d4ac..f015e2d1cf353 100644 --- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi +++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi @@ -61,8 +61,8 @@ 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 96ab983918e40..de5b50df833cd 100644 --- 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 65111f9843f4e..f678d18ad44ab 100644 --- a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi @@ -70,8 +70,8 @@ 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 cfda666a34f41..10ab4697950f5 100644 --- 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 f48291b7cbf0c..3dffbcd50bf68 100644 --- 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>; };