diff for duplicates of <8f507babc617050e7502849d008ddab548efa9c1.1536828567.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 5bb7dd0..ea9f3cb 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -17,7 +17,7 @@ index 02620c89e004..8589122e3c94 100644
dma-channels = <16>;
};
-+ ipmmu_ds0: mmu@e6740000 {
++ ipmmu_ds0: mmu at e6740000 {
+ compatible = "renesas,ipmmu-r8a774a1";
+ reg = <0 0xe6740000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 0>;
@@ -25,7 +25,7 @@ index 02620c89e004..8589122e3c94 100644
+ #iommu-cells = <1>;
+ };
+
-+ ipmmu_ds1: mmu@e7740000 {
++ ipmmu_ds1: mmu at e7740000 {
+ compatible = "renesas,ipmmu-r8a774a1";
+ reg = <0 0xe7740000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 1>;
@@ -33,7 +33,7 @@ index 02620c89e004..8589122e3c94 100644
+ #iommu-cells = <1>;
+ };
+
-+ ipmmu_hc: mmu@e6570000 {
++ ipmmu_hc: mmu at e6570000 {
+ compatible = "renesas,ipmmu-r8a774a1";
+ reg = <0 0xe6570000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 2>;
@@ -41,7 +41,7 @@ index 02620c89e004..8589122e3c94 100644
+ #iommu-cells = <1>;
+ };
+
-+ ipmmu_mm: mmu@e67b0000 {
++ ipmmu_mm: mmu at e67b0000 {
+ compatible = "renesas,ipmmu-r8a774a1";
+ reg = <0 0xe67b0000 0 0x1000>;
+ interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,
@@ -50,7 +50,7 @@ index 02620c89e004..8589122e3c94 100644
+ #iommu-cells = <1>;
+ };
+
-+ ipmmu_mp: mmu@ec670000 {
++ ipmmu_mp: mmu at ec670000 {
+ compatible = "renesas,ipmmu-r8a774a1";
+ reg = <0 0xec670000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 4>;
@@ -58,7 +58,7 @@ index 02620c89e004..8589122e3c94 100644
+ #iommu-cells = <1>;
+ };
+
-+ ipmmu_pv0: mmu@fd800000 {
++ ipmmu_pv0: mmu at fd800000 {
+ compatible = "renesas,ipmmu-r8a774a1";
+ reg = <0 0xfd800000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 5>;
@@ -66,7 +66,7 @@ index 02620c89e004..8589122e3c94 100644
+ #iommu-cells = <1>;
+ };
+
-+ ipmmu_pv1: mmu@fd950000 {
++ ipmmu_pv1: mmu at fd950000 {
+ compatible = "renesas,ipmmu-r8a774a1";
+ reg = <0 0xfd950000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 6>;
@@ -74,7 +74,7 @@ index 02620c89e004..8589122e3c94 100644
+ #iommu-cells = <1>;
+ };
+
-+ ipmmu_vc0: mmu@fe6b0000 {
++ ipmmu_vc0: mmu at fe6b0000 {
+ compatible = "renesas,ipmmu-r8a774a1";
+ reg = <0 0xfe6b0000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 8>;
@@ -82,7 +82,7 @@ index 02620c89e004..8589122e3c94 100644
+ #iommu-cells = <1>;
+ };
+
-+ ipmmu_vi0: mmu@febd0000 {
++ ipmmu_vi0: mmu at febd0000 {
+ compatible = "renesas,ipmmu-r8a774a1";
+ reg = <0 0xfebd0000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 9>;
@@ -90,7 +90,7 @@ index 02620c89e004..8589122e3c94 100644
+ #iommu-cells = <1>;
+ };
+
- avb: ethernet@e6800000 {
+ avb: ethernet at e6800000 {
compatible = "renesas,etheravb-r8a774a1",
"renesas,etheravb-rcar-gen3";
--
diff --git a/a/content_digest b/N1/content_digest
index d2570c8..66fc303 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 31/58] arm64: dts: renesas: r8a774a1: Add IPMMU device nodes\0"
@@ -11,13 +11,7 @@
"Date\0Thu, 13 Sep 2018 11:09:26 +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"
@@ -45,7 +39,7 @@
" \t\t\tdma-channels = <16>;\n",
" \t\t};\n",
" \n",
- "+\t\tipmmu_ds0: mmu\@e6740000 {\n",
+ "+\t\tipmmu_ds0: mmu at e6740000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a774a1\";\n",
"+\t\t\treg = <0 0xe6740000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 0>;\n",
@@ -53,7 +47,7 @@
"+\t\t\t#iommu-cells = <1>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tipmmu_ds1: mmu\@e7740000 {\n",
+ "+\t\tipmmu_ds1: mmu at e7740000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a774a1\";\n",
"+\t\t\treg = <0 0xe7740000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 1>;\n",
@@ -61,7 +55,7 @@
"+\t\t\t#iommu-cells = <1>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tipmmu_hc: mmu\@e6570000 {\n",
+ "+\t\tipmmu_hc: mmu at e6570000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a774a1\";\n",
"+\t\t\treg = <0 0xe6570000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 2>;\n",
@@ -69,7 +63,7 @@
"+\t\t\t#iommu-cells = <1>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tipmmu_mm: mmu\@e67b0000 {\n",
+ "+\t\tipmmu_mm: mmu at e67b0000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a774a1\";\n",
"+\t\t\treg = <0 0xe67b0000 0 0x1000>;\n",
"+\t\t\tinterrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,\n",
@@ -78,7 +72,7 @@
"+\t\t\t#iommu-cells = <1>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tipmmu_mp: mmu\@ec670000 {\n",
+ "+\t\tipmmu_mp: mmu at ec670000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a774a1\";\n",
"+\t\t\treg = <0 0xec670000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 4>;\n",
@@ -86,7 +80,7 @@
"+\t\t\t#iommu-cells = <1>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tipmmu_pv0: mmu\@fd800000 {\n",
+ "+\t\tipmmu_pv0: mmu at fd800000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a774a1\";\n",
"+\t\t\treg = <0 0xfd800000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 5>;\n",
@@ -94,7 +88,7 @@
"+\t\t\t#iommu-cells = <1>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tipmmu_pv1: mmu\@fd950000 {\n",
+ "+\t\tipmmu_pv1: mmu at fd950000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a774a1\";\n",
"+\t\t\treg = <0 0xfd950000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 6>;\n",
@@ -102,7 +96,7 @@
"+\t\t\t#iommu-cells = <1>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tipmmu_vc0: mmu\@fe6b0000 {\n",
+ "+\t\tipmmu_vc0: mmu at fe6b0000 {\n",
"+\t\t\tcompatible = \"renesas,ipmmu-r8a774a1\";\n",
"+\t\t\treg = <0 0xfe6b0000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 8>;\n",
@@ -110,7 +104,7 @@
"+\t\t\t#iommu-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-r8a774a1\";\n",
"+\t\t\treg = <0 0xfebd0000 0 0x1000>;\n",
"+\t\t\trenesas,ipmmu-main = <&ipmmu_mm 9>;\n",
@@ -118,11 +112,11 @@
"+\t\t\t#iommu-cells = <1>;\n",
"+\t\t};\n",
"+\n",
- " \t\tavb: ethernet\@e6800000 {\n",
+ " \t\tavb: ethernet at e6800000 {\n",
" \t\t\tcompatible = \"renesas,etheravb-r8a774a1\",\n",
" \t\t\t\t \"renesas,etheravb-rcar-gen3\";\n",
"-- \n",
"2.11.0"
]
-86092d9e0aced699b30b7244754a779ae73525abed50ab1c006c667f81e8b6e4
+ab979eae759b5ed4b6c47f22384f146de9510c4c7a3c5520713ad9dfa36b376f
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.