ARM: dts: imx: Add memory node unit name

Fix the following warnings from dtc by adding the unit name to memory nodes: Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name Converted using the following command: perl -p0777i -e 's/memory \{\n\t\treg = \<0x+([0-9a-f])/memory\@$1$\0000000 \{\n\t\treg = <0x$1/m' `find ./arch/arm/boot/dts -name "imx*"` The files below were manually fixed: -imx1-ads.dts -imx1-apf9328.dts -imx6q-pistachio.dts Signed-off-by: Marco Franchi <marco.franchi@nxp.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2024-12-04 11:06:58 +07:00 · 2018-01-24 11:22:14 -02:00 · 2018-01-24 11:22:14 -02:00 · ad00e080eb
commit ad00e080eb
parent 7f08e6aabd
121 changed files with 121 additions and 121 deletions
--- a/arch/arm/boot/dts/imx1-ads.dts
+++ b/arch/arm/boot/dts/imx1-ads.dts
@ -20,7 +20,7 @@ chosen {
 		stdout-path = &uart1;
 	};

-	memory {
+	memory@8000000 {
 		reg = <0x08000000 0x04000000>;
 	};

--- a/arch/arm/boot/dts/imx1-apf9328.dts
+++ b/arch/arm/boot/dts/imx1-apf9328.dts
@ -20,7 +20,7 @@ chosen {
 		stdout-path = &uart1;
 	};

-	memory {
+	memory@8000000 {
 		reg = <0x08000000 0x00800000>;
 	};
 };
--- a/arch/arm/boot/dts/imx23-evk.dts
+++ b/arch/arm/boot/dts/imx23-evk.dts
@ -16,7 +16,7 @@ / {
 	model = "Freescale i.MX23 Evaluation Kit";
 	compatible = "fsl,imx23-evk", "fsl,imx23";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x08000000>;
 	};

--- a/arch/arm/boot/dts/imx23-olinuxino.dts
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
@ -19,7 +19,7 @@ / {
 	model = "i.MX23 Olinuxino Low Cost Board";
 	compatible = "olimex,imx23-olinuxino", "fsl,imx23";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x04000000>;
 	};

--- a/arch/arm/boot/dts/imx23-sansa.dts
+++ b/arch/arm/boot/dts/imx23-sansa.dts
@ -49,7 +49,7 @@ / {
 	model = "SanDisk Sansa Fuze+";
 	compatible = "sandisk,sansa_fuze_plus", "fsl,imx23";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x04000000>;
 	};

--- a/arch/arm/boot/dts/imx23-stmp378x_devb.dts
+++ b/arch/arm/boot/dts/imx23-stmp378x_devb.dts
@ -16,7 +16,7 @@ / {
 	model = "Freescale STMP378x Development Board";
 	compatible = "fsl,stmp378x-devb", "fsl,imx23";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x04000000>;
 	};

--- a/arch/arm/boot/dts/imx23-xfi3.dts
+++ b/arch/arm/boot/dts/imx23-xfi3.dts
@ -48,7 +48,7 @@ / {
 	model = "Creative ZEN X-Fi3";
 	compatible = "creative,x-fi3", "fsl,imx23";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x04000000>;
 	};

--- a/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
+++ b/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
@ -17,7 +17,7 @@ / {
 	model = "Eukrea CPUIMX25";
 	compatible = "eukrea,cpuimx25", "fsl,imx25";

-	memory {
+	memory@80000000 {
 		reg = <0x80000000 0x4000000>; /* 64M */
 	};
 };
--- a/arch/arm/boot/dts/imx25-karo-tx25.dts
+++ b/arch/arm/boot/dts/imx25-karo-tx25.dts
@ -36,7 +36,7 @@ reg_fec_phy: regulator@0 {
 		};
 	};

-	memory {
+	memory@80000000 {
 		reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx25-pdk.dts
+++ b/arch/arm/boot/dts/imx25-pdk.dts
@ -18,7 +18,7 @@ / {
 	model = "Freescale i.MX25 Product Development Kit";
 	compatible = "fsl,imx25-pdk", "fsl,imx25";

-	memory {
+	memory@80000000 {
 		reg = <0x80000000 0x4000000>;
 	};

--- a/arch/arm/boot/dts/imx27-apf27.dts
+++ b/arch/arm/boot/dts/imx27-apf27.dts
@ -19,7 +19,7 @@ / {
 	model = "Armadeus Systems APF27 module";
 	compatible = "armadeus,imx27-apf27", "fsl,imx27";

-	memory {
+	memory@a0000000 {
 		reg = <0xa0000000 0x04000000>;
 	};

--- a/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
+++ b/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
@ -16,7 +16,7 @@ / {
 	model = "Eukrea CPUIMX27";
 	compatible = "eukrea,cpuimx27", "fsl,imx27";

-	memory {
+	memory@a0000000 {
 		reg = <0xa0000000 0x04000000>;
 	};

--- a/arch/arm/boot/dts/imx27-pdk.dts
+++ b/arch/arm/boot/dts/imx27-pdk.dts
@ -16,7 +16,7 @@ / {
 	model = "Freescale i.MX27 Product Development Kit";
 	compatible = "fsl,imx27-pdk", "fsl,imx27";

-	memory {
+	memory@a0000000 {
 		reg = <0xa0000000 0x08000000>;
 	};

--- a/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi
+++ b/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi
@ -17,7 +17,7 @@ / {
 	model = "Phytec pca100";
 	compatible = "phytec,imx27-pca100", "fsl,imx27";

-	memory {
+	memory@a0000000 {
 		reg = <0xa0000000 0x08000000>; /* 128MB */
 	};
 };
--- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
@ -16,7 +16,7 @@ / {
 	model = "Phytec pcm038";
 	compatible = "phytec,imx27-pcm038", "fsl,imx27";

-	memory {
+	memory@a0000000 {
 		reg = <0xa0000000 0x08000000>;
 	};

--- a/arch/arm/boot/dts/imx28-apf28.dts
+++ b/arch/arm/boot/dts/imx28-apf28.dts
@ -16,7 +16,7 @@ / {
 	model = "Armadeus Systems APF28 module";
 	compatible = "armadeus,imx28-apf28", "fsl,imx28";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x08000000>;
 	};

--- a/arch/arm/boot/dts/imx28-apx4devkit.dts
+++ b/arch/arm/boot/dts/imx28-apx4devkit.dts
@ -6,7 +6,7 @@ / {
 	model = "Bluegiga APX4 Development Kit";
 	compatible = "bluegiga,apx4devkit", "fsl,imx28";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x04000000>;
 	};

--- a/arch/arm/boot/dts/imx28-cfa10036.dts
+++ b/arch/arm/boot/dts/imx28-cfa10036.dts
@ -16,7 +16,7 @@ / {
 	model = "Crystalfontz CFA-10036 Board";
 	compatible = "crystalfontz,cfa10036", "fsl,imx28";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x08000000>;
 	};

--- a/arch/arm/boot/dts/imx28-duckbill-2-485.dts
+++ b/arch/arm/boot/dts/imx28-duckbill-2-485.dts
@ -19,7 +19,7 @@ / {
 	model = "I2SE Duckbill 2 485";
 	compatible = "i2se,duckbill-2-485", "i2se,duckbill-2", "fsl,imx28";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x08000000>;
 	};

--- a/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts
+++ b/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts
@ -20,7 +20,7 @@ / {
 	model = "I2SE Duckbill 2 EnOcean";
 	compatible = "i2se,duckbill-2-enocean", "i2se,duckbill-2", "fsl,imx28";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x08000000>;
 	};

--- a/arch/arm/boot/dts/imx28-duckbill-2-spi.dts
+++ b/arch/arm/boot/dts/imx28-duckbill-2-spi.dts
@ -23,7 +23,7 @@ aliases {
 		ethernet1 = &qca7000;
 	};

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x08000000>;
 	};

--- a/arch/arm/boot/dts/imx28-duckbill-2.dts
+++ b/arch/arm/boot/dts/imx28-duckbill-2.dts
@ -19,7 +19,7 @@ / {
 	model = "I2SE Duckbill 2";
 	compatible = "i2se,duckbill-2", "fsl,imx28";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x08000000>;
 	};

--- a/arch/arm/boot/dts/imx28-duckbill.dts
+++ b/arch/arm/boot/dts/imx28-duckbill.dts
@ -18,7 +18,7 @@ / {
 	model = "I2SE Duckbill";
 	compatible = "i2se,duckbill", "fsl,imx28";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x08000000>;
 	};

--- a/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts
+++ b/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts
@ -23,7 +23,7 @@ / {
 	model = "Eukrea Electromatique MBMX283LC";
 	compatible = "eukrea,mbmx283lc", "eukrea,mbmx28lc", "fsl,imx28";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x04000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts
+++ b/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts
@ -22,7 +22,7 @@ / {
 	model = "Eukrea Electromatique MBMX287LC";
 	compatible = "eukrea,mbmx287lc", "eukrea,mbmx283lc", "eukrea,mbmx28lc", "fsl,imx28";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x08000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@ -16,7 +16,7 @@ / {
 	model = "Freescale i.MX28 Evaluation Kit";
 	compatible = "fsl,imx28-evk", "fsl,imx28";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x08000000>;
 	};

--- a/arch/arm/boot/dts/imx28-m28.dtsi
+++ b/arch/arm/boot/dts/imx28-m28.dtsi
@ -15,7 +15,7 @@ / {
 	model = "Aries/DENX M28";
 	compatible = "aries,m28", "denx,m28", "fsl,imx28";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x08000000>;
 	};

--- a/arch/arm/boot/dts/imx28-m28cu3.dts
+++ b/arch/arm/boot/dts/imx28-m28cu3.dts
@ -16,7 +16,7 @@ / {
 	model = "MSR M28CU3";
 	compatible = "msr,m28cu3", "fsl,imx28";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x08000000>;
 	};

--- a/arch/arm/boot/dts/imx28-sps1.dts
+++ b/arch/arm/boot/dts/imx28-sps1.dts
@ -16,7 +16,7 @@ / {
 	model = "SchulerControl GmbH, SC SPS 1";
 	compatible = "schulercontrol,imx28-sps1", "fsl,imx28";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x08000000>;
 	};

--- a/arch/arm/boot/dts/imx28-ts4600.dts
+++ b/arch/arm/boot/dts/imx28-ts4600.dts
@ -19,7 +19,7 @@ / {
 	model = "Technologic Systems i.MX28 TS-4600";
 	compatible = "technologic,imx28-ts4600", "fsl,imx28";

-	memory {
+	memory@40000000 {
 		reg = <0x40000000 0x10000000>;   /* 256MB */
 	};

--- a/arch/arm/boot/dts/imx31-bug.dts
+++ b/arch/arm/boot/dts/imx31-bug.dts
@ -16,7 +16,7 @@ / {
 	model = "Buglabs i.MX31 Bug 1.x";
 	compatible = "buglabs,imx31-bug", "fsl,imx31";

-	memory {
+	memory@80000000 {
 		reg = <0x80000000 0x8000000>; /* 128M */
 	};
 };
--- a/arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi
+++ b/arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi
@ -17,7 +17,7 @@ / {
 	model = "Eukrea CPUIMX35";
 	compatible = "eukrea,cpuimx35", "fsl,imx35";

-	memory {
+	memory@80000000 {
 		reg = <0x80000000 0x8000000>; /* 128M */
 	};
 };
--- a/arch/arm/boot/dts/imx35-pdk.dts
+++ b/arch/arm/boot/dts/imx35-pdk.dts
@ -17,7 +17,7 @@ / {
 	model = "Freescale i.MX35 Product Development Kit";
 	compatible = "fsl,imx35-pdk", "fsl,imx35";

-	memory {
+	memory@80000000 {
 		reg = <0x80000000 0x8000000>,
 		      <0x90000000 0x8000000>;
 	};
--- a/arch/arm/boot/dts/imx50-evk.dts
+++ b/arch/arm/boot/dts/imx50-evk.dts
@ -18,7 +18,7 @@ / {
 	model = "Freescale i.MX50 Evaluation Kit";
 	compatible = "fsl,imx50-evk", "fsl,imx50";

-	memory {
+	memory@70000000 {
 		reg = <0x70000000 0x80000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx51-apf51.dts
+++ b/arch/arm/boot/dts/imx51-apf51.dts
@ -21,7 +21,7 @@ / {
 	model = "Armadeus Systems APF51 module";
 	compatible = "armadeus,imx51-apf51", "fsl,imx51";

-	memory {
+	memory@90000000 {
 		reg = <0x90000000 0x20000000>;
 	};

--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@ -21,7 +21,7 @@ chosen {
 		stdout-path = &uart1;
 	};

-	memory {
+	memory@90000000 {
 		reg = <0x90000000 0x20000000>;
 	};

--- a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
+++ b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
@ -16,7 +16,7 @@ / {
 	model = "Digi ConnectCore CC(W)-MX51";
 	compatible = "digi,connectcore-ccxmx51-som", "fsl,imx51";

-	memory {
+	memory@90000000 {
 		reg = <0x90000000 0x08000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
+++ b/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
@ -22,7 +22,7 @@ / {
 	model = "Eukrea CPUIMX51";
 	compatible = "eukrea,cpuimx51", "fsl,imx51";

-	memory {
+	memory@90000000 {
 		reg = <0x90000000 0x10000000>; /* 256M */
 	};
 };
--- a/arch/arm/boot/dts/imx51-ts4800.dts
+++ b/arch/arm/boot/dts/imx51-ts4800.dts
@ -17,7 +17,7 @@ chosen {
 		stdout-path = &uart1;
 	};

-	memory {
+	memory@90000000 {
 		reg = <0x90000000 0x10000000>;
 	};

--- a/arch/arm/boot/dts/imx53-ard.dts
+++ b/arch/arm/boot/dts/imx53-ard.dts
@ -17,7 +17,7 @@ / {
 	model = "Freescale i.MX53 Automotive Reference Design Board";
 	compatible = "fsl,imx53-ard", "fsl,imx53";

-	memory {
+	memory@70000000 {
 		reg = <0x70000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx53-cx9020.dts
+++ b/arch/arm/boot/dts/imx53-cx9020.dts
@ -21,7 +21,7 @@ chosen {
 		stdout-path = &uart2;
 	};

-	memory {
+	memory@70000000 {
 		reg = <0x70000000 0x20000000>,
 		      <0xb0000000 0x20000000>;
 	};
--- a/arch/arm/boot/dts/imx53-m53.dtsi
+++ b/arch/arm/boot/dts/imx53-m53.dtsi
@ -15,7 +15,7 @@ / {
 	model = "Aries/DENX M53";
 	compatible = "aries,imx53-m53", "denx,imx53-m53", "fsl,imx53";

-	memory {
+	memory@70000000 {
 		reg = <0x70000000 0x20000000>,
 		      <0xb0000000 0x20000000>;
 	};
--- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
@ -17,7 +17,7 @@ chosen {
 		stdout-path = &uart1;
 	};

-	memory {
+	memory@70000000 {
 		reg = <0x70000000 0x20000000>,
 		      <0xb0000000 0x20000000>;
 	};
--- a/arch/arm/boot/dts/imx53-smd.dts
+++ b/arch/arm/boot/dts/imx53-smd.dts
@ -17,7 +17,7 @@ / {
 	model = "Freescale i.MX53 Smart Mobile Reference Design Board";
 	compatible = "fsl,imx53-smd", "fsl,imx53";

-	memory {
+	memory@70000000 {
 		reg = <0x70000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx53-tqma53.dtsi
+++ b/arch/arm/boot/dts/imx53-tqma53.dtsi
@ -16,7 +16,7 @@ / {
 	model = "TQ TQMa53";
 	compatible = "tq,tqma53", "fsl,imx53";

-	memory {
+	memory@70000000 {
 		reg = <0x70000000 0x40000000>; /* Up to 1GiB */
 	};

--- a/arch/arm/boot/dts/imx53-usbarmory.dts
+++ b/arch/arm/boot/dts/imx53-usbarmory.dts
@ -57,7 +57,7 @@ chosen {
 		stdout-path = &uart1;
 	};

-	memory {
+	memory@70000000 {
 		reg = <0x70000000 0x20000000>;
 	};

--- a/arch/arm/boot/dts/imx6dl-apf6dev.dts
+++ b/arch/arm/boot/dts/imx6dl-apf6dev.dts
@ -54,7 +54,7 @@ / {
 	model = "Armadeus APF6 Solo Module on APF6Dev Board";
 	compatible = "armadeus,imx6dl-apf6dev", "armadeus,imx6dl-apf6", "fsl,imx6dl";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x20000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts
+++ b/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts
@ -48,7 +48,7 @@ / {
 	model = "aristainetos2 i.MX6 Dual Lite Board 4";
 	compatible = "fsl,imx6dl";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6dl-aristainetos2_7.dts
+++ b/arch/arm/boot/dts/imx6dl-aristainetos2_7.dts
@ -48,7 +48,7 @@ / {
 	model = "aristainetos2 i.MX6 Dual Lite Board 7";
 	compatible = "fsl,imx6dl";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
+++ b/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
@ -27,7 +27,7 @@ backlight {
 		status = "okay";
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6dl-aristainetos_7.dts
+++ b/arch/arm/boot/dts/imx6dl-aristainetos_7.dts
@ -16,7 +16,7 @@ / {
 	model = "aristainetos i.MX6 Dual Lite Board 7";
 	compatible = "fsl,imx6dl";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi
@ -16,7 +16,7 @@ / {
 	model = "Phytec phyFLEX-i.MX6 DualLite/Solo";
 	compatible = "phytec,imx6dl-pfla02", "fsl,imx6dl";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x20000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx6dl-rex-basic.dts
+++ b/arch/arm/boot/dts/imx6dl-rex-basic.dts
@ -16,7 +16,7 @@ / {
 	model = "Rex Basic i.MX6 Dual Lite Board";
 	compatible = "rex,imx6dl-rex-basic", "fsl,imx6dl";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x20000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx6dl-riotboard.dts
+++ b/arch/arm/boot/dts/imx6dl-riotboard.dts
@ -15,7 +15,7 @@ / {
 	model = "RIoTboard i.MX6S";
 	compatible = "riot,imx6s-riotboard", "fsl,imx6dl";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts
+++ b/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts
@ -16,7 +16,7 @@ / {
 	model = "Wandboard i.MX6 Dual Lite Board rev B1";
 	compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx6dl-wandboard-revd1.dts
+++ b/arch/arm/boot/dts/imx6dl-wandboard-revd1.dts
@ -16,7 +16,7 @@ / {
 	model = "Wandboard i.MX6 Dual Lite Board revD1";
 	compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx6dl-wandboard.dts
+++ b/arch/arm/boot/dts/imx6dl-wandboard.dts
@ -16,7 +16,7 @@ / {
 	model = "Wandboard i.MX6 Dual Lite Board";
 	compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx6q-apf6dev.dts
+++ b/arch/arm/boot/dts/imx6q-apf6dev.dts
@ -54,7 +54,7 @@ / {
 	model = "Armadeus APF6 Quad / Dual Module on APF6Dev Board";
 	compatible = "armadeus,imx6q-apf6dev", "armadeus,imx6q-apf6", "fsl,imx6q";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx6q-arm2.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@ -18,7 +18,7 @@ / {
 	model = "Freescale i.MX6 Quad Armadillo2 Board";
 	compatible = "fsl,imx6q-arm2", "fsl,imx6q";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};

--- a/arch/arm/boot/dts/imx6q-ba16.dtsi
+++ b/arch/arm/boot/dts/imx6q-ba16.dtsi
@ -46,7 +46,7 @@
 #include <dt-bindings/gpio/gpio.h>

 / {
-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6q-cm-fx6.dts
+++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts
@ -50,7 +50,7 @@ / {
 	model = "CompuLab CM-FX6";
 	compatible = "compulab,cm-fx6", "fsl,imx6q";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};

--- a/arch/arm/boot/dts/imx6q-display5.dtsi
+++ b/arch/arm/boot/dts/imx6q-display5.dtsi
@ -47,7 +47,7 @@ / {
 	model = "Liebherr (LWN) display5 i.MX6 Quad Board";
 	compatible = "lwn,display5", "fsl,imx6q";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
+++ b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
@ -29,7 +29,7 @@ aliases {
 		stmpe-i2c1 = &stmpe2;
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};

--- a/arch/arm/boot/dts/imx6q-evi.dts
+++ b/arch/arm/boot/dts/imx6q-evi.dts
@ -50,7 +50,7 @@ / {
 	model = "Uniwest Evi";
 	compatible = "uniwest,imx6q-evi", "fsl,imx6q";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6q-gk802.dts
+++ b/arch/arm/boot/dts/imx6q-gk802.dts
@ -18,7 +18,7 @@ chosen {
 		stdout-path = &uart4;
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6q-gw5400-a.dts
+++ b/arch/arm/boot/dts/imx6q-gw5400-a.dts
@ -60,7 +60,7 @@ led2: user3 {
 		};
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6q-marsboard.dts
+++ b/arch/arm/boot/dts/imx6q-marsboard.dts
@ -47,7 +47,7 @@ / {
 	model = "Embest MarS Board i.MX6Dual";
 	compatible = "embest,imx6q-marsboard", "fsl,imx6q";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6q-mccmon6.dts
+++ b/arch/arm/boot/dts/imx6q-mccmon6.dts
@ -19,7 +19,7 @@ / {
 	model = "Liebherr (LWN) monitor6 i.MX6 Quad Board";
 	compatible = "lwn,mccmon6", "fsl,imx6q";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};

--- a/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
@ -16,7 +16,7 @@ / {
 	model = "Phytec phyFLEX-i.MX6 Quad";
 	compatible = "phytec,imx6q-pfla02", "fsl,imx6q";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx6q-pistachio.dts
+++ b/arch/arm/boot/dts/imx6q-pistachio.dts
@ -56,7 +56,7 @@ chosen {
 		stdout-path = &uart4;
 	};

-	memory: memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};

--- a/arch/arm/boot/dts/imx6q-rex-pro.dts
+++ b/arch/arm/boot/dts/imx6q-rex-pro.dts
@ -16,7 +16,7 @@ / {
 	model = "Rex Pro i.MX6 Quad Board";
 	compatible = "rex,imx6q-rex-pro", "fsl,imx6q";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx6q-sbc6x.dts
+++ b/arch/arm/boot/dts/imx6q-sbc6x.dts
@ -12,7 +12,7 @@ / {
 	model = "MicroSys sbc6x board";
 	compatible = "microsys,sbc6x", "fsl,imx6q";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx6q-tbs2910.dts
+++ b/arch/arm/boot/dts/imx6q-tbs2910.dts
@ -59,7 +59,7 @@ chosen {
 		stdout-path = &uart1;
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};

--- a/arch/arm/boot/dts/imx6q-wandboard-revb1.dts
+++ b/arch/arm/boot/dts/imx6q-wandboard-revb1.dts
@ -16,7 +16,7 @@ / {
 	model = "Wandboard i.MX6 Quad Board rev B1";
 	compatible = "wand,imx6q-wandboard", "fsl,imx6q";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx6q-wandboard-revd1.dts
+++ b/arch/arm/boot/dts/imx6q-wandboard-revd1.dts
@ -16,7 +16,7 @@ / {
 	model = "Wandboard i.MX6 Quad Board revD1";
 	compatible = "wand,imx6q-wandboard", "fsl,imx6q";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx6q-wandboard.dts
+++ b/arch/arm/boot/dts/imx6q-wandboard.dts
@ -16,7 +16,7 @@ / {
 	model = "Wandboard i.MX6 Quad Board";
 	compatible = "wand,imx6q-wandboard", "fsl,imx6q";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
@ -44,7 +44,7 @@ led1: user2 {
 		};
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x20000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
@ -59,7 +59,7 @@ led2: user3 {
 		};
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x20000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
@ -59,7 +59,7 @@ led2: user3 {
 		};
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
@ -59,7 +59,7 @@ led2: user3 {
 		};
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
@ -74,7 +74,7 @@ led0: user1 {
 		};
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x20000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
@ -51,7 +51,7 @@ led2: user3 {
 		};
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x20000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-gw553x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw553x.dtsi
@ -80,7 +80,7 @@ led1: user2 {
 		};
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x20000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-gw5903.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5903.dtsi
@ -83,7 +83,7 @@ led0: user1 {
 		};
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
@ -93,7 +93,7 @@ led2: user3 {
 		};
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
@ -44,7 +44,7 @@
 #include <dt-bindings/sound/fsl-imx-audmux.h>

 / {
-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-icore.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-icore.dtsi
@ -45,7 +45,7 @@
 #include <dt-bindings/sound/fsl-imx-audmux.h>

 / {
-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
@ -46,7 +46,7 @@ chosen {
 		stdout-path = &uart2;
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x20000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
@ -46,7 +46,7 @@ chosen {
 		stdout-path = &uart2;
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0xF0000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
@ -46,7 +46,7 @@ chosen {
 		stdout-path = &uart2;
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
@ -48,7 +48,7 @@ chosen {
 		stdout-path = &uart2;
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@ -15,7 +15,7 @@ / {
 	model = "Phytec phyFLEX-i.MX6 Quad";
 	compatible = "phytec,imx6q-pfla02", "fsl,imx6q";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@ -13,7 +13,7 @@
 #include <dt-bindings/gpio/gpio.h>

 / {
-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
@ -49,7 +49,7 @@ chosen {
 		stdout-path = &uart2;
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@ -19,7 +19,7 @@ chosen {
 		stdout-path = &uart1;
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-udoo.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi
@ -35,7 +35,7 @@ gpio-poweroff {
 		pinctrl-names = "default";
 	};

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6qdl-var-dart.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-var-dart.dtsi
@ -10,7 +10,7 @@
 #include <dt-bindings/sound/fsl-imx-audmux.h>

 / {
-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6qp-wandboard-revd1.dts
+++ b/arch/arm/boot/dts/imx6qp-wandboard-revd1.dts
@ -16,7 +16,7 @@ / {
 	model = "Wandboard i.MX6 QuadPlus Board revD1";
 	compatible = "wand,imx6qp-wandboard", "fsl,imx6qp";

-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};
 };
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@ -16,7 +16,7 @@ / {
 	model = "Freescale i.MX6 SoloLite EVK Board";
 	compatible = "fsl,imx6sl-evk", "fsl,imx6sl";

-	memory {
+	memory@80000000 {
 		reg = <0x80000000 0x40000000>;
 	};

--- a/arch/arm/boot/dts/imx6sl-warp.dts
+++ b/arch/arm/boot/dts/imx6sl-warp.dts
@ -54,7 +54,7 @@ / {
 	model = "WaRP Board";
 	compatible = "warp,imx6sl-warp", "fsl,imx6sl";

-	memory {
+	memory@80000000 {
 		reg = <0x80000000 0x20000000>;
 	};

--- a/Show More
+++ b/Show More