diff for duplicates of <389baa409617cda237ae8ae6dd4e897a2d072710.1512640145.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index a32ed66..04aa346 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -17,7 +17,7 @@ index 8c94a313d9e1..9e7604108215 100644
<&a53_3>;
};
-+ ipmmu_vi0: mmu@febd0000 {
++ ipmmu_vi0: mmu at febd0000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xfebd0000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 9>;
@@ -26,7 +26,7 @@ index 8c94a313d9e1..9e7604108215 100644
+ status = "disabled";
+ };
+
-+ ipmmu_vc0: mmu@fe6b0000 {
++ ipmmu_vc0: mmu at fe6b0000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xfe6b0000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 8>;
@@ -35,7 +35,7 @@ index 8c94a313d9e1..9e7604108215 100644
+ status = "disabled";
+ };
+
-+ ipmmu_pv0: mmu@fd800000 {
++ ipmmu_pv0: mmu at fd800000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xfd800000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 5>;
@@ -44,7 +44,7 @@ index 8c94a313d9e1..9e7604108215 100644
+ status = "disabled";
+ };
+
-+ ipmmu_pv1: mmu@fd950000 {
++ ipmmu_pv1: mmu at fd950000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xfd950000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 6>;
@@ -53,7 +53,7 @@ index 8c94a313d9e1..9e7604108215 100644
+ status = "disabled";
+ };
+
-+ ipmmu_ir: mmu@ff8b0000 {
++ ipmmu_ir: mmu at ff8b0000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xff8b0000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 3>;
@@ -62,7 +62,7 @@ index 8c94a313d9e1..9e7604108215 100644
+ status = "disabled";
+ };
+
-+ ipmmu_hc: mmu@e6570000 {
++ ipmmu_hc: mmu at e6570000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xe6570000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 2>;
@@ -71,7 +71,7 @@ index 8c94a313d9e1..9e7604108215 100644
+ status = "disabled";
+ };
+
-+ ipmmu_rt: mmu@ffc80000 {
++ ipmmu_rt: mmu at ffc80000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xffc80000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 7>;
@@ -80,7 +80,7 @@ index 8c94a313d9e1..9e7604108215 100644
+ status = "disabled";
+ };
+
-+ ipmmu_mp: mmu@ec670000 {
++ ipmmu_mp: mmu at ec670000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xec670000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 4>;
@@ -89,7 +89,7 @@ index 8c94a313d9e1..9e7604108215 100644
+ status = "disabled";
+ };
+
-+ ipmmu_ds0: mmu@e6740000 {
++ ipmmu_ds0: mmu at e6740000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xe6740000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 0>;
@@ -98,7 +98,7 @@ index 8c94a313d9e1..9e7604108215 100644
+ status = "disabled";
+ };
+
-+ ipmmu_ds1: mmu@e7740000 {
++ ipmmu_ds1: mmu at e7740000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xe7740000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 1>;
@@ -107,7 +107,7 @@ index 8c94a313d9e1..9e7604108215 100644
+ status = "disabled";
+ };
+
-+ ipmmu_mm: mmu@e67b0000 {
++ ipmmu_mm: mmu at e67b0000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xe67b0000 0 0x1000>;
+ interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,
@@ -117,7 +117,7 @@ index 8c94a313d9e1..9e7604108215 100644
+ status = "disabled";
+ };
+
- cpg: clock-controller@e6150000 {
+ cpg: clock-controller at e6150000 {
compatible = "renesas,r8a7796-cpg-mssr";
reg = <0 0xe6150000 0 0x1000>;
--
diff --git a/a/content_digest b/N1/content_digest
index 53d934e..46385e0 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 08/54] arm64: dts: renesas: r8a7796: Add IPMMU device nodes\0"
@@ -11,13 +11,7 @@
"Date\0Thu, 7 Dec 2017 10:53:11 +0100\0"
]
[
- "To\0linux-renesas-soc\@vger.kernel.org\0"
-]
-[
- "Cc\0linux-arm-kernel\@lists.infradead.org",
- " Magnus Damm <magnus.damm\@gmail.com>",
- " Magnus Damm <damm+renesas\@opensource.se>",
- " Simon Horman <horms+renesas\@verge.net.au>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -45,7 +39,7 @@
" \t\t\t\t\t <&a53_3>;\n",
" \t\t};\n",
" \n",
- "+\t\tipmmu_vi0: mmu\@febd0000 {\n",
+ "+\t\tipmmu_vi0: mmu at febd0000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a7796\";\n",
"+\t\t\treg = <0 0xfebd0000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 9>;\n",
@@ -54,7 +48,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tipmmu_vc0: mmu\@fe6b0000 {\n",
+ "+\t\tipmmu_vc0: mmu at fe6b0000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a7796\";\n",
"+\t\t\treg = <0 0xfe6b0000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 8>;\n",
@@ -63,7 +57,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tipmmu_pv0: mmu\@fd800000 {\n",
+ "+\t\tipmmu_pv0: mmu at fd800000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a7796\";\n",
"+\t\t\treg = <0 0xfd800000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 5>;\n",
@@ -72,7 +66,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tipmmu_pv1: mmu\@fd950000 {\n",
+ "+\t\tipmmu_pv1: mmu at fd950000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a7796\";\n",
"+\t\t\treg = <0 0xfd950000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 6>;\n",
@@ -81,7 +75,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-r8a7796\";\n",
"+\t\t\treg = <0 0xff8b0000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 3>;\n",
@@ -90,7 +84,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tipmmu_hc: mmu\@e6570000 {\n",
+ "+\t\tipmmu_hc: mmu at e6570000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a7796\";\n",
"+\t\t\treg = <0 0xe6570000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 2>;\n",
@@ -99,7 +93,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-r8a7796\";\n",
"+\t\t\treg = <0 0xffc80000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 7>;\n",
@@ -108,7 +102,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tipmmu_mp: mmu\@ec670000 {\n",
+ "+\t\tipmmu_mp: mmu at ec670000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a7796\";\n",
"+\t\t\treg = <0 0xec670000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 4>;\n",
@@ -117,7 +111,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tipmmu_ds0: mmu\@e6740000 {\n",
+ "+\t\tipmmu_ds0: mmu at e6740000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a7796\";\n",
"+\t\t\treg = <0 0xe6740000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 0>;\n",
@@ -126,7 +120,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-r8a7796\";\n",
"+\t\t\treg = <0 0xe7740000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 1>;\n",
@@ -135,7 +129,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-r8a7796\";\n",
"+\t\t\treg = <0 0xe67b0000 0 0x1000>;\n",
"+\t\t\tinterrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,\n",
@@ -145,11 +139,11 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- " \t\tcpg: clock-controller\@e6150000 {\n",
+ " \t\tcpg: clock-controller at e6150000 {\n",
" \t\t\tcompatible = \"renesas,r8a7796-cpg-mssr\";\n",
" \t\t\treg = <0 0xe6150000 0 0x1000>;\n",
"-- \n",
"2.11.0"
]
-36e8fbc5953e6df4ddc151742728eedbd5c7c21d77a9bc2785e03f0fd5299725
+d8fb0a3c9abded0b2adcebfc56372d70e46afd661f3a048f47fae4b297e1ec17
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.