diff for duplicates of <ce3b52a1595b25b05df86388d08aa454a885349d.1512640145.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index eb80f62..b4be2e0 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -24,7 +24,7 @@ index 8b97842aedb7..5f73ee2dfd6d 100644
#power-domain-cells = <1>;
};
-+ ipmmu_vi0: mmu@febd0000 {
++ ipmmu_vi0: mmu at febd0000 {
+ compatible = "renesas,ipmmu-r8a77970";
+ reg = <0 0xfebd0000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 9>;
@@ -33,7 +33,7 @@ index 8b97842aedb7..5f73ee2dfd6d 100644
+ status = "disabled";
+ };
+
-+ ipmmu_ir: mmu@ff8b0000 {
++ ipmmu_ir: mmu at ff8b0000 {
+ compatible = "renesas,ipmmu-r8a77970";
+ reg = <0 0xff8b0000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 3>;
@@ -42,7 +42,7 @@ index 8b97842aedb7..5f73ee2dfd6d 100644
+ status = "disabled";
+ };
+
-+ ipmmu_rt: mmu@ffc80000 {
++ ipmmu_rt: mmu at ffc80000 {
+ compatible = "renesas,ipmmu-r8a77970";
+ reg = <0 0xffc80000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 7>;
@@ -51,7 +51,7 @@ index 8b97842aedb7..5f73ee2dfd6d 100644
+ status = "disabled";
+ };
+
-+ ipmmu_ds1: mmu@e7740000 {
++ ipmmu_ds1: mmu at e7740000 {
+ compatible = "renesas,ipmmu-r8a77970";
+ reg = <0 0xe7740000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 1>;
@@ -60,7 +60,7 @@ index 8b97842aedb7..5f73ee2dfd6d 100644
+ status = "disabled";
+ };
+
-+ ipmmu_mm: mmu@e67b0000 {
++ ipmmu_mm: mmu at e67b0000 {
+ compatible = "renesas,ipmmu-r8a77970";
+ reg = <0 0xe67b0000 0 0x1000>;
+ interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,
@@ -70,7 +70,7 @@ index 8b97842aedb7..5f73ee2dfd6d 100644
+ status = "disabled";
+ };
+
- intc_ex: interrupt-controller@e61c0000 {
+ intc_ex: interrupt-controller at e61c0000 {
compatible = "renesas,intc-ex-r8a77970", "renesas,irqc";
#interrupt-cells = <2>;
--
diff --git a/a/content_digest b/N1/content_digest
index d99c5eb..e499373 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 45/54] arm64: dts: renesas: r8a77970: Add IPMMU device nodes\0"
@@ -11,12 +11,7 @@
"Date\0Thu, 7 Dec 2017 10:53:48 +0100\0"
]
[
- "To\0linux-renesas-soc\@vger.kernel.org\0"
-]
-[
- "Cc\0linux-arm-kernel\@lists.infradead.org",
- " Magnus Damm <magnus.damm\@gmail.com>",
- " Simon Horman <horms+renesas\@verge.net.au>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -51,7 +46,7 @@
" \t\t\t#power-domain-cells = <1>;\n",
" \t\t};\n",
" \n",
- "+\t\tipmmu_vi0: mmu\@febd0000 {\n",
+ "+\t\tipmmu_vi0: mmu at febd0000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a77970\";\n",
"+\t\t\treg = <0 0xfebd0000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 9>;\n",
@@ -60,7 +55,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tipmmu_ir: mmu\@ff8b0000 {\n",
+ "+\t\tipmmu_ir: mmu at ff8b0000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a77970\";\n",
"+\t\t\treg = <0 0xff8b0000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 3>;\n",
@@ -69,7 +64,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tipmmu_rt: mmu\@ffc80000 {\n",
+ "+\t\tipmmu_rt: mmu at ffc80000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a77970\";\n",
"+\t\t\treg = <0 0xffc80000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 7>;\n",
@@ -78,7 +73,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tipmmu_ds1: mmu\@e7740000 {\n",
+ "+\t\tipmmu_ds1: mmu at e7740000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a77970\";\n",
"+\t\t\treg = <0 0xe7740000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 1>;\n",
@@ -87,7 +82,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tipmmu_mm: mmu\@e67b0000 {\n",
+ "+\t\tipmmu_mm: mmu at e67b0000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a77970\";\n",
"+\t\t\treg = <0 0xe67b0000 0 0x1000>;\n",
"+\t\t\tinterrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,\n",
@@ -97,11 +92,11 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- " \t\tintc_ex: interrupt-controller\@e61c0000 {\n",
+ " \t\tintc_ex: interrupt-controller at e61c0000 {\n",
" \t\t\tcompatible = \"renesas,intc-ex-r8a77970\", \"renesas,irqc\";\n",
" \t\t\t#interrupt-cells = <2>;\n",
"-- \n",
"2.11.0"
]
-c95f668ed61588e110b5cee269f222c2e7adfcbc9e7f848219f656b94c75f262
+d47dfe7fe49f43fe3f0e4e6de9bba2040a13344e4db418a2cfd0be9dc63189ca
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.