diff for duplicates of <YK9XWcdrMK7Tz0Ph@nbwork.lan>

diff --git a/a/1.txt b/N1/1.txt
index ea55b21..e503eab 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -59,7 +59,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=tty0 console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts b/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts
 > index 6aeb47c44eba..79d17841b3d7 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts
@@ -85,7 +85,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
 > index c2ece0b91885..3395de96ee11 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
@@ -98,7 +98,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts b/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts
 > index 2c29ac037d32..7c6af7f226e7 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts
@@ -111,7 +111,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts b/arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts
 > index dcab6e78dfa4..33e413ca07e4 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts
@@ -124,7 +124,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=tty0 console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts b/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts
 > index 5ef88c377358..01dace8f5e5f 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts
@@ -137,7 +137,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
 > index 2fb8b147f489..90a3f485c67a 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
@@ -163,7 +163,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
 > index 07593897fc9a..1752f3250e44 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
@@ -176,7 +176,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts b/arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts
 > index 80c92e065a10..5a98a19f445e 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts
@@ -202,7 +202,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts b/arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts
 > index c29e5f4d86ad..8f543cca7c21 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts
@@ -215,7 +215,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=tty0 console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts b/arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts
 > index 084c455ad4cb..bcc1820f5c07 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts
@@ -228,7 +228,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=tty0 console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts b/arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts
 > index 73319917cb74..3ef8358ff764 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts
@@ -241,7 +241,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 40000000 {
+>  	memory@40000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
 > index 42b37a204241..c0847636f20b 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
@@ -254,7 +254,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts b/arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts
 > index 15c1f0ac81dc..a52a289cee85 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts
@@ -267,7 +267,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-mowgli.dts b/arch/arm/boot/dts/aspeed-bmc-opp-mowgli.dts
 > index 8503152faaf0..7d38d121ec6d 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-mowgli.dts
@@ -280,7 +280,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts b/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts
 > index 91dced7e7849..3d4bdad27c2d 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts
@@ -293,7 +293,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
 > index eb4e93a57ff4..cd660c1ff3f5 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
@@ -306,7 +306,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 40000000 {
+>  	memory@40000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
 > index fd2e014dae75..084f54866f38 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
@@ -319,7 +319,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
 > index d56b5ed09b37..4816486c0c9e 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
@@ -332,7 +332,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts
 > index c1478d2db602..e863ec088970 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts
@@ -345,7 +345,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200n8 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts b/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
 > index 01074b6e3e03..328ef472c479 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
@@ -358,7 +358,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 40000000 {
+>  	memory@40000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
 > index 85d58a63ae90..230f3584bcab 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
@@ -371,7 +371,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
 > index 4bcc82046362..7ae4ea0d2931 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
@@ -384,7 +384,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts b/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts
 > index 03c161493ffc..61bc74b423cf 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts
@@ -397,7 +397,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
 > index a68ff0675c28..9605e53f5bbf 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
@@ -410,7 +410,7 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "console=ttyS4,115200 earlycon";
 >  	};
 >  
->  	memory at 40000000 {
+>  	memory@40000000 {
 > diff --git a/arch/arm/boot/dts/aspeed-bmc-supermicro-x11spi.dts b/arch/arm/boot/dts/aspeed-bmc-supermicro-x11spi.dts
 > index bc16ad2b5c80..50f3c6a5c0c8 100644
 > --- a/arch/arm/boot/dts/aspeed-bmc-supermicro-x11spi.dts
@@ -423,7 +423,12 @@ Acked-by: Alexander Filippov <a.filippov@yadro>
 > +		bootargs = "earlycon";
 >  	};
 >  
->  	memory at 80000000 {
+>  	memory@80000000 {
 > -- 
 > 2.30.2
->
+> 
+
+_______________________________________________
+linux-arm-kernel mailing list
+linux-arm-kernel@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index fb34f9e..fdac28e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,31 @@
  "ref\020210526051220.136432-1-joel@jms.id.au\0"
  "From\0Alexander A. Filippov <a.filippov@yadro.com>\0"
- "Subject\0[PATCH] ARM: dts: aspeed: Set earlycon boot argument\0"
+ "Subject\0Re: [PATCH] ARM: dts: aspeed: Set earlycon boot argument\0"
  "Date\0Thu, 27 May 2021 11:24:57 +0300\0"
- "To\0linux-aspeed@lists.ozlabs.org\0"
+ "To\0Joel Stanley <joel@jms.id.au>\0"
+ "Cc\0Arnd Bergmann <arnd@arndb.de>"
+  <linux-aspeed@lists.ozlabs.org>
+  <linux-arm-kernel@lists.infradead.org>
+  Andrew Jeffery <andrew@aj.id.au>
+  Adriana Kobylak <anoo@us.ibm.com>
+  Alexander Filippov <a.filippov@yadro.com>
+  Amithash Prasad <amithash@fb.com>
+  Andrew Peng <pengms1@lenovo.com>
+  Ben Pai <Ben_Pai@wistron.com>
+  Brad Bishop <bradleyb@fuzziesquirrel.com>
+  Brian Yang <yang.brianc.w@inventec.com>
+  Eddie James <eajames@linux.ibm.com>
+  Hongwei Zhang <hongweiz@ami.com>
+  Ken Chen <chen.kenyy@inventec.com>
+  Lotus Xu <xuxiaohan@bytedance.com>
+  Manikandan Elumalai <manikandan.hcl.ers.epl@gmail.com>
+  Quan Nguyen <quan@os.amperecomputing.com>
+  Ryan Sie <ryans@supermicro.com.tw>
+  Supreeth Venkatesh <supreeth.venkatesh@amd.com>
+  Tao Ren <taoren@fb.com>
+  Xo Wang <xow@google.com>
+  Yuan Yao <yao.yuan@linaro.org>
+ " Zev Weiss <zev@bewilderbeest.net>\0"
  "\00:1\0"
  "b\0"
  "On Wed, May 26, 2021 at 02:42:20PM +0930, Joel Stanley wrote:\n"
@@ -66,7 +89,7 @@
  "> +\t\tbootargs = \"console=tty0 console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts b/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts\n"
  "> index 6aeb47c44eba..79d17841b3d7 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts\n"
@@ -92,7 +115,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts\n"
  "> index c2ece0b91885..3395de96ee11 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts\n"
@@ -105,7 +128,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts b/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts\n"
  "> index 2c29ac037d32..7c6af7f226e7 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts\n"
@@ -118,7 +141,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts b/arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts\n"
  "> index dcab6e78dfa4..33e413ca07e4 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts\n"
@@ -131,7 +154,7 @@
  "> +\t\tbootargs = \"console=tty0 console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts b/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts\n"
  "> index 5ef88c377358..01dace8f5e5f 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts\n"
@@ -144,7 +167,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts\n"
  "> index 2fb8b147f489..90a3f485c67a 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts\n"
@@ -170,7 +193,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts\n"
  "> index 07593897fc9a..1752f3250e44 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts\n"
@@ -183,7 +206,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts b/arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts\n"
  "> index 80c92e065a10..5a98a19f445e 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts\n"
@@ -209,7 +232,7 @@
  "> +\t\tbootargs = \"earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts b/arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts\n"
  "> index c29e5f4d86ad..8f543cca7c21 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts\n"
@@ -222,7 +245,7 @@
  "> +\t\tbootargs = \"console=tty0 console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts b/arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts\n"
  "> index 084c455ad4cb..bcc1820f5c07 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts\n"
@@ -235,7 +258,7 @@
  "> +\t\tbootargs = \"console=tty0 console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts b/arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts\n"
  "> index 73319917cb74..3ef8358ff764 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts\n"
@@ -248,7 +271,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 40000000 {\n"
+ ">  \tmemory@40000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts\n"
  "> index 42b37a204241..c0847636f20b 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts\n"
@@ -261,7 +284,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts b/arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts\n"
  "> index 15c1f0ac81dc..a52a289cee85 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts\n"
@@ -274,7 +297,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-mowgli.dts b/arch/arm/boot/dts/aspeed-bmc-opp-mowgli.dts\n"
  "> index 8503152faaf0..7d38d121ec6d 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-opp-mowgli.dts\n"
@@ -287,7 +310,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts b/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts\n"
  "> index 91dced7e7849..3d4bdad27c2d 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts\n"
@@ -300,7 +323,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts\n"
  "> index eb4e93a57ff4..cd660c1ff3f5 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts\n"
@@ -313,7 +336,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 40000000 {\n"
+ ">  \tmemory@40000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts\n"
  "> index fd2e014dae75..084f54866f38 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts\n"
@@ -326,7 +349,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts\n"
  "> index d56b5ed09b37..4816486c0c9e 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts\n"
@@ -339,7 +362,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts\n"
  "> index c1478d2db602..e863ec088970 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts\n"
@@ -352,7 +375,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200n8 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts b/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts\n"
  "> index 01074b6e3e03..328ef472c479 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts\n"
@@ -365,7 +388,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 40000000 {\n"
+ ">  \tmemory@40000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts\n"
  "> index 85d58a63ae90..230f3584bcab 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts\n"
@@ -378,7 +401,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts\n"
  "> index 4bcc82046362..7ae4ea0d2931 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts\n"
@@ -391,7 +414,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts b/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts\n"
  "> index 03c161493ffc..61bc74b423cf 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts\n"
@@ -404,7 +427,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts\n"
  "> index a68ff0675c28..9605e53f5bbf 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts\n"
@@ -417,7 +440,7 @@
  "> +\t\tbootargs = \"console=ttyS4,115200 earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 40000000 {\n"
+ ">  \tmemory@40000000 {\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-bmc-supermicro-x11spi.dts b/arch/arm/boot/dts/aspeed-bmc-supermicro-x11spi.dts\n"
  "> index bc16ad2b5c80..50f3c6a5c0c8 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-bmc-supermicro-x11spi.dts\n"
@@ -430,9 +453,14 @@
  "> +\t\tbootargs = \"earlycon\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tmemory at 80000000 {\n"
+ ">  \tmemory@80000000 {\n"
  "> -- \n"
  "> 2.30.2\n"
- >
+ "> \n"
+ "\n"
+ "_______________________________________________\n"
+ "linux-arm-kernel mailing list\n"
+ "linux-arm-kernel@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-af332d91714a1d4418d77411b6a85d39baf33fd5ba9cc847bf4649c67cd89848
+37691c6320adc40e34b07b9a112d7f3f217c76c55ec7df087a25e4acd1668e02
