diff for duplicates of <20220720231605.GA30806@packtop>

diff --git a/a/1.txt b/N1/1.txt
index b09a859..45fc7fb 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -81,7 +81,7 @@ A blank line here would be nice for formatting consistency...
 >+		num-chipselects = <1>;
 >+		cs-gpios = <&gpio0 ASPEED_GPIO(X, 0) GPIO_ACTIVE_LOW>;
 >+
->+		tpmdev at 0 {
+>+		tpmdev@0 {
 >+			compatible = "tcg,tpm_tis-spi";
 >+			spi-max-frequency = <33000000>;
 >+			reg = <0>;
@@ -147,14 +147,14 @@ A blank line here would be nice for formatting consistency...
 >+
 >+&fmc {
 >+	status = "okay";
->+	flash at 0 {
+>+	flash@0 {
 >+		status = "okay";
 >+		m25p,fast-read;
 >+		label = "spi0.1";
 >+		spi-max-frequency = <50000000>;
 >+		#include "openbmc-flash-layout-128.dtsi"
 >+	};
->+	flash at 1 {
+>+	flash@1 {
 >+		status = "okay";
 >+		m25p,fast-read;
 >+		label = "spi0.0";
@@ -163,7 +163,7 @@ A blank line here would be nice for formatting consistency...
 >+	};
 
 The labels on these look backwards from what I'd guess was probably
-intended (flash at 0 is spi0.1 and flash at 1 is spi0.0).
+intended (flash@0 is spi0.1 and flash@1 is spi0.0).
 
 >+};
 >+
@@ -175,7 +175,7 @@ preferred style is to put a space after '//' (here and elsewhere).
 
 >+	status = "okay";
 >+	multi-master;
->+	ipmb0 at 10 {
+>+	ipmb0@10 {
 >+		compatible = "ipmb-dev";
 >+		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
 >+		i2c-protocol;
@@ -186,7 +186,7 @@ preferred style is to put a space after '//' (here and elsewhere).
 >+	//Host2 IPMB bus
 >+	status = "okay";
 >+	multi-master;
->+	ipmb1 at 10 {
+>+	ipmb1@10 {
 >+		compatible = "ipmb-dev";
 >+		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
 >+		i2c-protocol;
@@ -197,7 +197,7 @@ preferred style is to put a space after '//' (here and elsewhere).
 >+	//Host3 IPMB bus
 >+	status = "okay";
 >+	multi-master;
->+	ipmb2 at 10 {
+>+	ipmb2@10 {
 >+		compatible = "ipmb-dev";
 >+		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
 >+		i2c-protocol;
@@ -208,7 +208,7 @@ preferred style is to put a space after '//' (here and elsewhere).
 >+	//Host1 IPMB bus
 >+	status = "okay";
 >+	multi-master;
->+	ipmb3 at 10 {
+>+	ipmb3@10 {
 >+		compatible = "ipmb-dev";
 >+		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
 >+		i2c-protocol;
@@ -234,7 +234,7 @@ preferred style is to put a space after '//' (here and elsewhere).
 >+&i2c8 {
 >+	//NIC SENSOR TEMP
 >+	status = "okay";
->+	tmp421 at 1f {
+>+	tmp421@1f {
 >+		compatible = "ti,tmp421";
 >+		reg = <0x1f>;
 >+	};
@@ -244,7 +244,7 @@ preferred style is to put a space after '//' (here and elsewhere).
 >+	// Debug-Card IPMB bus
 >+	status = "okay";
 >+	multi-master;
->+	ipmb9 at 30 {
+>+	ipmb9@30 {
 >+		compatible = "ipmb-dev";
 >+		reg = <(0x30 | I2C_OWN_SLAVE_ADDRESS)>;
 >+		i2c-protocol;
@@ -258,7 +258,7 @@ preferred style is to put a space after '//' (here and elsewhere).
 >+&i2c11 {
 >+	status = "okay";
 >+	//FRU EEPROM
->+	eeprom at 51 {
+>+	eeprom@51 {
 >+		compatible = "atmel,24c64";
 >+		reg = <0x51>;
 >+		pagesize = <32>;
@@ -268,12 +268,12 @@ preferred style is to put a space after '//' (here and elsewhere).
 >+&i2c12 {
 >+	status = "okay";
 >+	//INLET TEMP
->+	tmp75 at 4e {
+>+	tmp75@4e {
 >+		compatible = "ti,tmp75";
 >+		reg = <0x4e>;
 >+	};
 >+	//OUTLET TEMP
->+	tmp75 at 4f {
+>+	tmp75@4f {
 >+		compatible = "ti,tmp75";
 >+		reg = <0x4f>;
 >+	};
diff --git a/a/content_digest b/N1/content_digest
index b70261f..b77ef63 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,23 @@
  "ref\020220720105331.GA23472@logan-ThinkPad-T14-Gen-1\0"
  "From\0Zev Weiss <zweiss@equinix.com>\0"
- "Subject\0[PATCH v4] ARM: dts: aspeed: Adding Facebook Yosemite V3.5 BMC\0"
+ "Subject\0Re: [PATCH v4] ARM: dts: aspeed: Adding Facebook Yosemite V3.5 BMC\0"
  "Date\0Wed, 20 Jul 2022 23:16:31 +0000\0"
- "To\0linux-aspeed@lists.ozlabs.org\0"
+ "To\0Logananth Sundararaj <logananth13.hcl@gmail.com>\0"
+ "Cc\0devicetree@vger.kernel.org <devicetree@vger.kernel.org>"
+  linux-aspeed@lists.ozlabs.org <linux-aspeed@lists.ozlabs.org>
+  Arnd Bergmann <arnd@arndb.de>
+  Andrew Jeffery <andrew@aj.id.au>
+  openbmc@lists.ozlabs.org <openbmc@lists.ozlabs.org>
+  linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>
+  naveen.mosess@hcl.com <naveen.mosess@hcl.com>
+  thangavel.k@hcl.com <thangavel.k@hcl.com>
+  soc@kernel.org <soc@kernel.org>
+  Rob Herring <robh+dt@kernel.org>
+  Joel Stanley <joel@jms.id.au>
+  Olof Johansson <olof@lixom.net>
+  garnermic@gmail.com <garnermic@gmail.com>
+  velumanit@hcl.com <velumanit@hcl.com>
+ " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0"
  "\00:1\0"
  "b\0"
  "On Wed, Jul 20, 2022 at 03:53:31AM PDT, Logananth Sundararaj wrote:\n"
@@ -88,7 +103,7 @@
  ">+\t\tnum-chipselects = <1>;\n"
  ">+\t\tcs-gpios = <&gpio0 ASPEED_GPIO(X, 0) GPIO_ACTIVE_LOW>;\n"
  ">+\n"
- ">+\t\ttpmdev at 0 {\n"
+ ">+\t\ttpmdev@0 {\n"
  ">+\t\t\tcompatible = \"tcg,tpm_tis-spi\";\n"
  ">+\t\t\tspi-max-frequency = <33000000>;\n"
  ">+\t\t\treg = <0>;\n"
@@ -154,14 +169,14 @@
  ">+\n"
  ">+&fmc {\n"
  ">+\tstatus = \"okay\";\n"
- ">+\tflash at 0 {\n"
+ ">+\tflash@0 {\n"
  ">+\t\tstatus = \"okay\";\n"
  ">+\t\tm25p,fast-read;\n"
  ">+\t\tlabel = \"spi0.1\";\n"
  ">+\t\tspi-max-frequency = <50000000>;\n"
  ">+\t\t#include \"openbmc-flash-layout-128.dtsi\"\n"
  ">+\t};\n"
- ">+\tflash at 1 {\n"
+ ">+\tflash@1 {\n"
  ">+\t\tstatus = \"okay\";\n"
  ">+\t\tm25p,fast-read;\n"
  ">+\t\tlabel = \"spi0.0\";\n"
@@ -170,7 +185,7 @@
  ">+\t};\n"
  "\n"
  "The labels on these look backwards from what I'd guess was probably\n"
- "intended (flash at 0 is spi0.1 and flash at 1 is spi0.0).\n"
+ "intended (flash@0 is spi0.1 and flash@1 is spi0.0).\n"
  "\n"
  ">+};\n"
  ">+\n"
@@ -182,7 +197,7 @@
  "\n"
  ">+\tstatus = \"okay\";\n"
  ">+\tmulti-master;\n"
- ">+\tipmb0 at 10 {\n"
+ ">+\tipmb0@10 {\n"
  ">+\t\tcompatible = \"ipmb-dev\";\n"
  ">+\t\treg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;\n"
  ">+\t\ti2c-protocol;\n"
@@ -193,7 +208,7 @@
  ">+\t//Host2 IPMB bus\n"
  ">+\tstatus = \"okay\";\n"
  ">+\tmulti-master;\n"
- ">+\tipmb1 at 10 {\n"
+ ">+\tipmb1@10 {\n"
  ">+\t\tcompatible = \"ipmb-dev\";\n"
  ">+\t\treg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;\n"
  ">+\t\ti2c-protocol;\n"
@@ -204,7 +219,7 @@
  ">+\t//Host3 IPMB bus\n"
  ">+\tstatus = \"okay\";\n"
  ">+\tmulti-master;\n"
- ">+\tipmb2 at 10 {\n"
+ ">+\tipmb2@10 {\n"
  ">+\t\tcompatible = \"ipmb-dev\";\n"
  ">+\t\treg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;\n"
  ">+\t\ti2c-protocol;\n"
@@ -215,7 +230,7 @@
  ">+\t//Host1 IPMB bus\n"
  ">+\tstatus = \"okay\";\n"
  ">+\tmulti-master;\n"
- ">+\tipmb3 at 10 {\n"
+ ">+\tipmb3@10 {\n"
  ">+\t\tcompatible = \"ipmb-dev\";\n"
  ">+\t\treg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;\n"
  ">+\t\ti2c-protocol;\n"
@@ -241,7 +256,7 @@
  ">+&i2c8 {\n"
  ">+\t//NIC SENSOR TEMP\n"
  ">+\tstatus = \"okay\";\n"
- ">+\ttmp421 at 1f {\n"
+ ">+\ttmp421@1f {\n"
  ">+\t\tcompatible = \"ti,tmp421\";\n"
  ">+\t\treg = <0x1f>;\n"
  ">+\t};\n"
@@ -251,7 +266,7 @@
  ">+\t// Debug-Card IPMB bus\n"
  ">+\tstatus = \"okay\";\n"
  ">+\tmulti-master;\n"
- ">+\tipmb9 at 30 {\n"
+ ">+\tipmb9@30 {\n"
  ">+\t\tcompatible = \"ipmb-dev\";\n"
  ">+\t\treg = <(0x30 | I2C_OWN_SLAVE_ADDRESS)>;\n"
  ">+\t\ti2c-protocol;\n"
@@ -265,7 +280,7 @@
  ">+&i2c11 {\n"
  ">+\tstatus = \"okay\";\n"
  ">+\t//FRU EEPROM\n"
- ">+\teeprom at 51 {\n"
+ ">+\teeprom@51 {\n"
  ">+\t\tcompatible = \"atmel,24c64\";\n"
  ">+\t\treg = <0x51>;\n"
  ">+\t\tpagesize = <32>;\n"
@@ -275,12 +290,12 @@
  ">+&i2c12 {\n"
  ">+\tstatus = \"okay\";\n"
  ">+\t//INLET TEMP\n"
- ">+\ttmp75 at 4e {\n"
+ ">+\ttmp75@4e {\n"
  ">+\t\tcompatible = \"ti,tmp75\";\n"
  ">+\t\treg = <0x4e>;\n"
  ">+\t};\n"
  ">+\t//OUTLET TEMP\n"
- ">+\ttmp75 at 4f {\n"
+ ">+\ttmp75@4f {\n"
  ">+\t\tcompatible = \"ti,tmp75\";\n"
  ">+\t\treg = <0x4f>;\n"
  ">+\t};\n"
@@ -326,4 +341,4 @@
  ">2.17.1\n"
  >
 
-417a0550138507ea4097be3f7f70c220f996ef6a8606e294e1382843f924d55b
+594b07c4f4125ac04d03041c70e645868b7dd8f9b963cf16f3b6c4362e421c6d
