diff for duplicates of <e2f04248fcd47bdc037b4bfe7864ebd0a807e30c.1536828567.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 62bd9cd..874f358 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -20,7 +20,7 @@ index c9ac545f08f3..50c9265aa1c4 100644
status = "disabled";
};
-+ rcar_sound: sound@ec500000 {
++ rcar_sound: sound at ec500000 {
+ /*
+ * #sound-dai-cells is required
+ *
@@ -218,16 +218,16 @@ index c9ac545f08f3..50c9265aa1c4 100644
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
-+ port@0 {
++ port at 0 {
+ reg = <0>;
+ };
-+ port@1 {
++ port at 1 {
+ reg = <1>;
+ };
+ };
+ };
+
-+ audma0: dma-controller@ec700000 {
++ audma0: dma-controller at ec700000 {
+ compatible = "renesas,dmac-r8a774a1",
+ "renesas,rcar-dmac";
+ reg = <0 0xec700000 0 0x10000>;
@@ -261,7 +261,7 @@ index c9ac545f08f3..50c9265aa1c4 100644
+ dma-channels = <16>;
+ };
+
-+ audma1: dma-controller@ec720000 {
++ audma1: dma-controller at ec720000 {
+ compatible = "renesas,dmac-r8a774a1",
+ "renesas,rcar-dmac";
+ reg = <0 0xec720000 0 0x10000>;
@@ -295,7 +295,7 @@ index c9ac545f08f3..50c9265aa1c4 100644
+ dma-channels = <16>;
+ };
+
- sdhi0: sd@ee100000 {
+ sdhi0: sd at ee100000 {
compatible = "renesas,sdhi-r8a774a1",
"renesas,rcar-gen3-sdhi";
--
diff --git a/a/content_digest b/N1/content_digest
index 17c1238..b955e67 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0cover.1536828567.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 35/58] arm64: dts: renesas: r8a774a1: Add audio support\0"
@@ -11,13 +11,7 @@
"Date\0Thu, 13 Sep 2018 11:09:30 +0200\0"
]
[
- "To\0linux-renesas-soc\@vger.kernel.org\0"
-]
-[
- "Cc\0linux-arm-kernel\@lists.infradead.org",
- " Magnus Damm <magnus.damm\@gmail.com>",
- " Biju Das <biju.das\@bp.renesas.com>",
- " Simon Horman <horms+renesas\@verge.net.au>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -48,7 +42,7 @@
" \t\t\tstatus = \"disabled\";\n",
" \t\t};\n",
" \n",
- "+\t\trcar_sound: sound\@ec500000 {\n",
+ "+\t\trcar_sound: sound at ec500000 {\n",
"+\t\t\t/*\n",
"+\t\t\t * #sound-dai-cells is required\n",
"+\t\t\t *\n",
@@ -246,16 +240,16 @@
"+\t\t\tports {\n",
"+\t\t\t\t#address-cells = <1>;\n",
"+\t\t\t\t#size-cells = <0>;\n",
- "+\t\t\t\tport\@0 {\n",
+ "+\t\t\t\tport at 0 {\n",
"+\t\t\t\t\treg = <0>;\n",
"+\t\t\t\t};\n",
- "+\t\t\t\tport\@1 {\n",
+ "+\t\t\t\tport at 1 {\n",
"+\t\t\t\t\treg = <1>;\n",
"+\t\t\t\t};\n",
"+\t\t\t};\n",
"+\t\t};\n",
"+\n",
- "+\t\taudma0: dma-controller\@ec700000 {\n",
+ "+\t\taudma0: dma-controller at ec700000 {\n",
"+\t\t\tcompatible = \"renesas,dmac-r8a774a1\",\n",
"+\t\t\t\t \"renesas,rcar-dmac\";\n",
"+\t\t\treg = <0 0xec700000 0 0x10000>;\n",
@@ -289,7 +283,7 @@
"+\t\t\tdma-channels = <16>;\n",
"+\t\t};\n",
"+\n",
- "+\t\taudma1: dma-controller\@ec720000 {\n",
+ "+\t\taudma1: dma-controller at ec720000 {\n",
"+\t\t\tcompatible = \"renesas,dmac-r8a774a1\",\n",
"+\t\t\t\t \"renesas,rcar-dmac\";\n",
"+\t\t\treg = <0 0xec720000 0 0x10000>;\n",
@@ -323,11 +317,11 @@
"+\t\t\tdma-channels = <16>;\n",
"+\t\t};\n",
"+\n",
- " \t\tsdhi0: sd\@ee100000 {\n",
+ " \t\tsdhi0: sd at ee100000 {\n",
" \t\t\tcompatible = \"renesas,sdhi-r8a774a1\",\n",
" \t\t\t\t \"renesas,rcar-gen3-sdhi\";\n",
"-- \n",
"2.11.0"
]
-1293e278b9272faf3251187649e609e169eb0f1e17fb9f21a36c9218ca7a391a
+e176163eef1694d2c95625e4972e4b87c97ed89089cd1067a55d8cad77e14156
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.