diff for duplicates of <942164ca49897397a9f21048d83517ea8af6d044.1512640145.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index c4a2ae0..079f622 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -18,7 +18,7 @@ index 788e3afae6e3..04a392a9d9de 100644
resets = <&cpg 407>;
};
-+ dmac0: dma-controller@e6700000 {
++ dmac0: dma-controller at e6700000 {
+ compatible = "renesas,dmac-r8a77995",
+ "renesas,rcar-dmac";
+ reg = <0 0xe6700000 0 0x10000>;
@@ -42,7 +42,7 @@ index 788e3afae6e3..04a392a9d9de 100644
+ dma-channels = <8>;
+ };
+
-+ dmac1: dma-controller@e7300000 {
++ dmac1: dma-controller at e7300000 {
+ compatible = "renesas,dmac-r8a77995",
+ "renesas,rcar-dmac";
+ reg = <0 0xe7300000 0 0x10000>;
@@ -66,7 +66,7 @@ index 788e3afae6e3..04a392a9d9de 100644
+ dma-channels = <8>;
+ };
+
-+ dmac2: dma-controller@e7310000 {
++ dmac2: dma-controller at e7310000 {
+ compatible = "renesas,dmac-r8a77995",
+ "renesas,rcar-dmac";
+ reg = <0 0xe7310000 0 0x10000>;
@@ -90,7 +90,7 @@ index 788e3afae6e3..04a392a9d9de 100644
+ dma-channels = <8>;
+ };
+
- gpio0: gpio@e6050000 {
+ gpio0: gpio at e6050000 {
compatible = "renesas,gpio-r8a77995",
"renesas,rcar-gen3-gpio",
--
diff --git a/a/content_digest b/N1/content_digest
index 164f787..6b33862 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0cover.1512640145.git.horms+renesas\@verge.net.au\0"
]
[
- "From\0Simon Horman <horms+renesas\@verge.net.au>\0"
+ "From\0horms+renesas\@verge.net.au (Simon Horman)\0"
]
[
"Subject\0[PATCH 17/54] arm64: dts: renesas: r8a77995: add SYS-DMAC nodes\0"
@@ -11,13 +11,7 @@
"Date\0Thu, 7 Dec 2017 10:53:20 +0100\0"
]
[
- "To\0linux-renesas-soc\@vger.kernel.org\0"
-]
-[
- "Cc\0linux-arm-kernel\@lists.infradead.org",
- " Magnus Damm <magnus.damm\@gmail.com>",
- " Ulrich Hecht <ulrich.hecht+renesas\@gmail.com>",
- " Simon Horman <horms+renesas\@verge.net.au>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -46,7 +40,7 @@
" \t\t\tresets = <&cpg 407>;\n",
" \t\t};\n",
" \n",
- "+\t\tdmac0: dma-controller\@e6700000 {\n",
+ "+\t\tdmac0: dma-controller at e6700000 {\n",
"+\t\t\tcompatible = \"renesas,dmac-r8a77995\",\n",
"+\t\t\t\t \"renesas,rcar-dmac\";\n",
"+\t\t\treg = <0 0xe6700000 0 0x10000>;\n",
@@ -70,7 +64,7 @@
"+\t\t\tdma-channels = <8>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tdmac1: dma-controller\@e7300000 {\n",
+ "+\t\tdmac1: dma-controller at e7300000 {\n",
"+\t\t\tcompatible = \"renesas,dmac-r8a77995\",\n",
"+\t\t\t\t \"renesas,rcar-dmac\";\n",
"+\t\t\treg = <0 0xe7300000 0 0x10000>;\n",
@@ -94,7 +88,7 @@
"+\t\t\tdma-channels = <8>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tdmac2: dma-controller\@e7310000 {\n",
+ "+\t\tdmac2: dma-controller at e7310000 {\n",
"+\t\t\tcompatible = \"renesas,dmac-r8a77995\",\n",
"+\t\t\t\t \"renesas,rcar-dmac\";\n",
"+\t\t\treg = <0 0xe7310000 0 0x10000>;\n",
@@ -118,11 +112,11 @@
"+\t\t\tdma-channels = <8>;\n",
"+\t\t};\n",
"+\n",
- " \t\tgpio0: gpio\@e6050000 {\n",
+ " \t\tgpio0: gpio at e6050000 {\n",
" \t\t\tcompatible = \"renesas,gpio-r8a77995\",\n",
" \t\t\t\t \"renesas,rcar-gen3-gpio\",\n",
"-- \n",
"2.11.0"
]
-fbbbd53653229d7bef1898e382bf3fedd3002f8d1448eed3f2905723df2c64e5
+283a966dbf49d5d8f38dc18553a24ba945bc24152efe3f92e39f33258cd61733
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.