diff for duplicates of <282419526ad7ba3d0ff5e53c20a5f4f5a273197f.1536828567.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 87142a0..dd7e320 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -22,7 +22,7 @@ index 50c9265aa1c4..5d0109a376c2 100644
resets = <&cpg 408>;
};
-+ fcpf0: fcp@fe950000 {
++ fcpf0: fcp at fe950000 {
+ compatible = "renesas,fcpf";
+ reg = <0 0xfe950000 0 0x200>;
+ clocks = <&cpg CPG_MOD 615>;
@@ -30,7 +30,7 @@ index 50c9265aa1c4..5d0109a376c2 100644
+ resets = <&cpg 615>;
+ };
+
-+ fcpvb0: fcp@fe96f000 {
++ fcpvb0: fcp at fe96f000 {
+ compatible = "renesas,fcpv";
+ reg = <0 0xfe96f000 0 0x200>;
+ clocks = <&cpg CPG_MOD 607>;
@@ -38,7 +38,7 @@ index 50c9265aa1c4..5d0109a376c2 100644
+ resets = <&cpg 607>;
+ };
+
-+ fcpvd0: fcp@fea27000 {
++ fcpvd0: fcp at fea27000 {
+ compatible = "renesas,fcpv";
+ reg = <0 0xfea27000 0 0x200>;
+ clocks = <&cpg CPG_MOD 603>;
@@ -47,7 +47,7 @@ index 50c9265aa1c4..5d0109a376c2 100644
+ iommus = <&ipmmu_vi0 8>;
+ };
+
-+ fcpvd1: fcp@fea2f000 {
++ fcpvd1: fcp at fea2f000 {
+ compatible = "renesas,fcpv";
+ reg = <0 0xfea2f000 0 0x200>;
+ clocks = <&cpg CPG_MOD 602>;
@@ -56,7 +56,7 @@ index 50c9265aa1c4..5d0109a376c2 100644
+ iommus = <&ipmmu_vi0 9>;
+ };
+
-+ fcpvd2: fcp@fea37000 {
++ fcpvd2: fcp at fea37000 {
+ compatible = "renesas,fcpv";
+ reg = <0 0xfea37000 0 0x200>;
+ clocks = <&cpg CPG_MOD 601>;
@@ -65,7 +65,7 @@ index 50c9265aa1c4..5d0109a376c2 100644
+ iommus = <&ipmmu_vi0 10>;
+ };
+
-+ fcpvi0: fcp@fe9af000 {
++ fcpvi0: fcp at fe9af000 {
+ compatible = "renesas,fcpv";
+ reg = <0 0xfe9af000 0 0x200>;
+ clocks = <&cpg CPG_MOD 611>;
@@ -74,7 +74,7 @@ index 50c9265aa1c4..5d0109a376c2 100644
+ iommus = <&ipmmu_vc0 19>;
+ };
+
- prr: chipid@fff00044 {
+ prr: chipid at fff00044 {
compatible = "renesas,prr";
reg = <0 0xfff00044 0 4>;
--
diff --git a/a/content_digest b/N1/content_digest
index dc2b367..519b05f 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 36/58] arm64: dts: renesas: r8a774a1: Add FCPF and FCPV instances\0"
@@ -11,13 +11,7 @@
"Date\0Thu, 13 Sep 2018 11:09:31 +0200\0"
]
[
- "To\0linux-renesas-soc\@vger.kernel.org\0"
-]
-[
- "Cc\0linux-arm-kernel\@lists.infradead.org",
- " Magnus Damm <magnus.damm\@gmail.com>",
- " Fabrizio Castro <fabrizio.castro\@bp.renesas.com>",
- " Simon Horman <horms+renesas\@verge.net.au>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -50,7 +44,7 @@
" \t\t\tresets = <&cpg 408>;\n",
" \t\t};\n",
" \n",
- "+\t\tfcpf0: fcp\@fe950000 {\n",
+ "+\t\tfcpf0: fcp at fe950000 {\n",
"+\t\t\tcompatible = \"renesas,fcpf\";\n",
"+\t\t\treg = <0 0xfe950000 0 0x200>;\n",
"+\t\t\tclocks = <&cpg CPG_MOD 615>;\n",
@@ -58,7 +52,7 @@
"+\t\t\tresets = <&cpg 615>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tfcpvb0: fcp\@fe96f000 {\n",
+ "+\t\tfcpvb0: fcp at fe96f000 {\n",
"+\t\t\tcompatible = \"renesas,fcpv\";\n",
"+\t\t\treg = <0 0xfe96f000 0 0x200>;\n",
"+\t\t\tclocks = <&cpg CPG_MOD 607>;\n",
@@ -66,7 +60,7 @@
"+\t\t\tresets = <&cpg 607>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tfcpvd0: fcp\@fea27000 {\n",
+ "+\t\tfcpvd0: fcp at fea27000 {\n",
"+\t\t\tcompatible = \"renesas,fcpv\";\n",
"+\t\t\treg = <0 0xfea27000 0 0x200>;\n",
"+\t\t\tclocks = <&cpg CPG_MOD 603>;\n",
@@ -75,7 +69,7 @@
"+\t\t\tiommus = <&ipmmu_vi0 8>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tfcpvd1: fcp\@fea2f000 {\n",
+ "+\t\tfcpvd1: fcp at fea2f000 {\n",
"+\t\t\tcompatible = \"renesas,fcpv\";\n",
"+\t\t\treg = <0 0xfea2f000 0 0x200>;\n",
"+\t\t\tclocks = <&cpg CPG_MOD 602>;\n",
@@ -84,7 +78,7 @@
"+\t\t\tiommus = <&ipmmu_vi0 9>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tfcpvd2: fcp\@fea37000 {\n",
+ "+\t\tfcpvd2: fcp at fea37000 {\n",
"+\t\t\tcompatible = \"renesas,fcpv\";\n",
"+\t\t\treg = <0 0xfea37000 0 0x200>;\n",
"+\t\t\tclocks = <&cpg CPG_MOD 601>;\n",
@@ -93,7 +87,7 @@
"+\t\t\tiommus = <&ipmmu_vi0 10>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tfcpvi0: fcp\@fe9af000 {\n",
+ "+\t\tfcpvi0: fcp at fe9af000 {\n",
"+\t\t\tcompatible = \"renesas,fcpv\";\n",
"+\t\t\treg = <0 0xfe9af000 0 0x200>;\n",
"+\t\t\tclocks = <&cpg CPG_MOD 611>;\n",
@@ -102,11 +96,11 @@
"+\t\t\tiommus = <&ipmmu_vc0 19>;\n",
"+\t\t};\n",
"+\n",
- " \t\tprr: chipid\@fff00044 {\n",
+ " \t\tprr: chipid at fff00044 {\n",
" \t\t\tcompatible = \"renesas,prr\";\n",
" \t\t\treg = <0 0xfff00044 0 4>;\n",
"-- \n",
"2.11.0"
]
-d2127838479d2c050f78ea1dc8da6145644e2a758b469460eb1735f2833e80e9
+ab17587977f22120fb9e6d729c423b42b062bf02fedd67fedc18e6b94dfd9fb6
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.