diff for duplicates of <e5c47d13-bbb9-e607-47cb-6bf4cf6bebd9@linux.microsoft.com>

diff --git a/a/1.txt b/N1/1.txt
index b4412c1..c9ff03e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -12,11 +12,11 @@ On 7/4/2022 7:09 PM, Neal Liu wrote:
 > index c89092c3905b..04f98d1dbb97 100644
 > --- a/arch/arm/boot/dts/aspeed-g5.dtsi
 > +++ b/arch/arm/boot/dts/aspeed-g5.dtsi
-> @@ -262,6 +262,14 @@ rng: hwrng at 1e6e2078 {
+> @@ -262,6 +262,14 @@ rng: hwrng@1e6e2078 {
 >   				quality = <100>;
 >   			};
 >   
-> +			hace: crypto at 1e6e3000 {
+> +			hace: crypto@1e6e3000 {
 > +				compatible = "aspeed,ast2500-hace";
 > +				reg = <0x1e6e3000 0x100>;
 > +				interrupts = <4>;
@@ -24,7 +24,7 @@ On 7/4/2022 7:09 PM, Neal Liu wrote:
 > +				resets = <&syscon ASPEED_RESET_HACE>;
 > +			};
 > +
->   			gfx: display at 1e6e6000 {
+>   			gfx: display@1e6e6000 {
 >   				compatible = "aspeed,ast2500-gfx", "syscon";
 >   				reg = <0x1e6e6000 0x1000>;
 > diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi
@@ -35,7 +35,7 @@ On 7/4/2022 7:09 PM, Neal Liu wrote:
 >   			#size-cells = <1>;
 >   			ranges;
 >   
-> +			hace: crypto at 1e6d0000 {
+> +			hace: crypto@1e6d0000 {
 > +				compatible = "aspeed,ast2600-hace";
 > +				reg = <0x1e6d0000 0x200>;
 > +				interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/a/content_digest b/N1/content_digest
index ef6507d..fe44717 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,26 @@
  "ref\020220705020936.1751771-1-neal_liu@aspeedtech.com\0"
  "ref\020220705020936.1751771-4-neal_liu@aspeedtech.com\0"
  "From\0Dhananjay Phadke <dphadke@linux.microsoft.com>\0"
- "Subject\0[PATCH v7 3/5] ARM: dts: aspeed: Add HACE device controller node\0"
+ "Subject\0Re: [PATCH v7 3/5] ARM: dts: aspeed: Add HACE device controller node\0"
  "Date\0Wed, 13 Jul 2022 00:48:04 -0700\0"
- "To\0linux-aspeed@lists.ozlabs.org\0"
+ "To\0Neal Liu <neal_liu@aspeedtech.com>"
+  Corentin Labbe <clabbe.montjoie@gmail.com>
+  Christophe JAILLET <christophe.jaillet@wanadoo.fr>
+  Randy Dunlap <rdunlap@infradead.org>
+  Herbert Xu <herbert@gondor.apana.org.au>
+  David S . Miller <davem@davemloft.net>
+  Rob Herring <robh+dt@kernel.org>
+  Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
+  Joel Stanley <joel@jms.id.au>
+  Andrew Jeffery <andrew@aj.id.au>
+  Dhananjay Phadke <dhphadke@microsoft.com>
+ " Johnny Huang <johnny_huang@aspeedtech.com>\0"
+ "Cc\0devicetree@vger.kernel.org"
+  linux-aspeed@lists.ozlabs.org
+  BMC-SW@aspeedtech.com
+  linux-kernel@vger.kernel.org
+  linux-crypto@vger.kernel.org
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On 7/4/2022 7:09 PM, Neal Liu wrote:\n"
@@ -20,11 +37,11 @@
  "> index c89092c3905b..04f98d1dbb97 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-g5.dtsi\n"
  "> +++ b/arch/arm/boot/dts/aspeed-g5.dtsi\n"
- "> @@ -262,6 +262,14 @@ rng: hwrng at 1e6e2078 {\n"
+ "> @@ -262,6 +262,14 @@ rng: hwrng@1e6e2078 {\n"
  ">   \t\t\t\tquality = <100>;\n"
  ">   \t\t\t};\n"
  ">   \n"
- "> +\t\t\thace: crypto at 1e6e3000 {\n"
+ "> +\t\t\thace: crypto@1e6e3000 {\n"
  "> +\t\t\t\tcompatible = \"aspeed,ast2500-hace\";\n"
  "> +\t\t\t\treg = <0x1e6e3000 0x100>;\n"
  "> +\t\t\t\tinterrupts = <4>;\n"
@@ -32,7 +49,7 @@
  "> +\t\t\t\tresets = <&syscon ASPEED_RESET_HACE>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- ">   \t\t\tgfx: display at 1e6e6000 {\n"
+ ">   \t\t\tgfx: display@1e6e6000 {\n"
  ">   \t\t\t\tcompatible = \"aspeed,ast2500-gfx\", \"syscon\";\n"
  ">   \t\t\t\treg = <0x1e6e6000 0x1000>;\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi\n"
@@ -43,7 +60,7 @@
  ">   \t\t\t#size-cells = <1>;\n"
  ">   \t\t\tranges;\n"
  ">   \n"
- "> +\t\t\thace: crypto at 1e6d0000 {\n"
+ "> +\t\t\thace: crypto@1e6d0000 {\n"
  "> +\t\t\t\tcompatible = \"aspeed,ast2600-hace\";\n"
  "> +\t\t\t\treg = <0x1e6d0000 0x200>;\n"
  "> +\t\t\t\tinterrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -57,4 +74,4 @@
  "\n"
  Reviewed-by: Dhananjay Phadke <dphadke@linux.microsoft.com>
 
-454ff9ed3cc67cd02d04b6e7b95d8d547fd14d3882df04b133d0b67a87d5b814
+9ee96c25ec8caa7dda852d575e2a489a56c8ccc923ed88eff312ddb63a735889
