diff for duplicates of <1491330992-9876-5-git-send-email-menschel.p@posteo.de>
diff --git a/a/1.txt b/N1/1.txt
index d6993b8..4ac606d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -3,31 +3,31 @@ ordering by rising physical address.
From
-uart7: serial@01c29c00
-i2c0: i2c@01c2ac00
-i2c1: i2c@01c2b000
-i2c2: i2c@01c2b400
-i2c3: i2c@01c2b800
-i2c4: i2c@01c2c000
-gmac: ethernet@01c50000
-hstimer@01c60000
-gic: interrupt-controller@01c81000
-ps20: ps2@01c2a000
-ps21: ps2@01c2a400
+uart7: serial at 01c29c00
+i2c0: i2c at 01c2ac00
+i2c1: i2c at 01c2b000
+i2c2: i2c at 01c2b400
+i2c3: i2c at 01c2b800
+i2c4: i2c at 01c2c000
+gmac: ethernet at 01c50000
+hstimer at 01c60000
+gic: interrupt-controller at 01c81000
+ps20: ps2 at 01c2a000
+ps21: ps2 at 01c2a400
to
-uart7: serial@01c29c00
-ps20: ps2@01c2a000
-ps21: ps2@01c2a400
-i2c0: i2c@01c2ac00
-i2c1: i2c@01c2b000
-i2c2: i2c@01c2b400
-i2c3: i2c@01c2b800
-i2c4: i2c@01c2c000
-gmac: ethernet@01c50000
-hstimer@01c60000
-gic: interrupt-controller@01c81000
+uart7: serial at 01c29c00
+ps20: ps2 at 01c2a000
+ps21: ps2 at 01c2a400
+i2c0: i2c at 01c2ac00
+i2c1: i2c at 01c2b000
+i2c2: i2c at 01c2b400
+i2c3: i2c at 01c2b800
+i2c4: i2c at 01c2c000
+gmac: ethernet at 01c50000
+hstimer at 01c60000
+gic: interrupt-controller at 01c81000
Signed-off-by: Patrick Menschel <menschel.p@posteo.de>
---
@@ -42,7 +42,7 @@ index 2db97fc..100b4e9 100644
status = "disabled";
};
-+ ps20: ps2@01c2a000 {
++ ps20: ps2 at 01c2a000 {
+ compatible = "allwinner,sun4i-a10-ps2";
+ reg = <0x01c2a000 0x400>;
+ interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
@@ -50,7 +50,7 @@ index 2db97fc..100b4e9 100644
+ status = "disabled";
+ };
+
-+ ps21: ps2@01c2a400 {
++ ps21: ps2 at 01c2a400 {
+ compatible = "allwinner,sun4i-a10-ps2";
+ reg = <0x01c2a400 0x400>;
+ interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
@@ -58,14 +58,14 @@ index 2db97fc..100b4e9 100644
+ status = "disabled";
+ };
+
- i2c0: i2c@01c2ac00 {
+ i2c0: i2c at 01c2ac00 {
compatible = "allwinner,sun7i-a20-i2c",
"allwinner,sun4i-a10-i2c";
@@ -1629,20 +1645,5 @@
interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
};
-- ps20: ps2@01c2a000 {
+- ps20: ps2 at 01c2a000 {
- compatible = "allwinner,sun4i-a10-ps2";
- reg = <0x01c2a000 0x400>;
- interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
@@ -73,7 +73,7 @@ index 2db97fc..100b4e9 100644
- status = "disabled";
- };
-
-- ps21: ps2@01c2a400 {
+- ps21: ps2 at 01c2a400 {
- compatible = "allwinner,sun4i-a10-ps2";
- reg = <0x01c2a400 0x400>;
- interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/a/content_digest b/N1/content_digest
index 9577a2b..bbdd99c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001491330992-9876-1-git-send-email-menschel.p\@posteo.de\0"
]
[
- "From\0Patrick Menschel <menschel.p\@posteo.de>\0"
+ "From\0menschel.p\@posteo.de (Patrick Menschel)\0"
]
[
"Subject\0[PATCH v4 4/6] ARM: dts: sun7i: fix device node ordering\0"
@@ -11,18 +11,7 @@
"Date\0Tue, 4 Apr 2017 20:36:30 +0200\0"
]
[
- "To\0robh+dt\@kernel.org",
- " mark.rutland\@arm.com",
- " linux\@armlinux.org.uk",
- " maxime.ripard\@free-electrons.com",
- " wens\@csie.org",
- " devicetree\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-kernel\@vger.kernel.org",
- " linux-can\@vger.kernel.org\0"
-]
-[
- "Cc\0Patrick Menschel <menschel.p\@posteo.de>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -36,31 +25,31 @@
"\n",
"From\n",
"\n",
- "uart7: serial\@01c29c00\n",
- "i2c0: i2c\@01c2ac00\n",
- "i2c1: i2c\@01c2b000\n",
- "i2c2: i2c\@01c2b400\n",
- "i2c3: i2c\@01c2b800\n",
- "i2c4: i2c\@01c2c000\n",
- "gmac: ethernet\@01c50000\n",
- "hstimer\@01c60000\n",
- "gic: interrupt-controller\@01c81000\n",
- "ps20: ps2\@01c2a000\n",
- "ps21: ps2\@01c2a400\n",
+ "uart7: serial at 01c29c00\n",
+ "i2c0: i2c at 01c2ac00\n",
+ "i2c1: i2c at 01c2b000\n",
+ "i2c2: i2c at 01c2b400\n",
+ "i2c3: i2c at 01c2b800\n",
+ "i2c4: i2c at 01c2c000\n",
+ "gmac: ethernet at 01c50000\n",
+ "hstimer at 01c60000\n",
+ "gic: interrupt-controller at 01c81000\n",
+ "ps20: ps2 at 01c2a000\n",
+ "ps21: ps2 at 01c2a400\n",
"\n",
"to\n",
"\n",
- "uart7: serial\@01c29c00\n",
- "ps20: ps2\@01c2a000\n",
- "ps21: ps2\@01c2a400\n",
- "i2c0: i2c\@01c2ac00\n",
- "i2c1: i2c\@01c2b000\n",
- "i2c2: i2c\@01c2b400\n",
- "i2c3: i2c\@01c2b800\n",
- "i2c4: i2c\@01c2c000\n",
- "gmac: ethernet\@01c50000\n",
- "hstimer\@01c60000\n",
- "gic: interrupt-controller\@01c81000\n",
+ "uart7: serial at 01c29c00\n",
+ "ps20: ps2 at 01c2a000\n",
+ "ps21: ps2 at 01c2a400\n",
+ "i2c0: i2c at 01c2ac00\n",
+ "i2c1: i2c at 01c2b000\n",
+ "i2c2: i2c at 01c2b400\n",
+ "i2c3: i2c at 01c2b800\n",
+ "i2c4: i2c at 01c2c000\n",
+ "gmac: ethernet at 01c50000\n",
+ "hstimer at 01c60000\n",
+ "gic: interrupt-controller at 01c81000\n",
"\n",
"Signed-off-by: Patrick Menschel <menschel.p\@posteo.de>\n",
"---\n",
@@ -75,7 +64,7 @@
" \t\t\tstatus = \"disabled\";\n",
" \t\t};\n",
" \n",
- "+\t\tps20: ps2\@01c2a000 {\n",
+ "+\t\tps20: ps2 at 01c2a000 {\n",
"+\t\t\tcompatible = \"allwinner,sun4i-a10-ps2\";\n",
"+\t\t\treg = <0x01c2a000 0x400>;\n",
"+\t\t\tinterrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -83,7 +72,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tps21: ps2\@01c2a400 {\n",
+ "+\t\tps21: ps2 at 01c2a400 {\n",
"+\t\t\tcompatible = \"allwinner,sun4i-a10-ps2\";\n",
"+\t\t\treg = <0x01c2a400 0x400>;\n",
"+\t\t\tinterrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -91,14 +80,14 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- " \t\ti2c0: i2c\@01c2ac00 {\n",
+ " \t\ti2c0: i2c at 01c2ac00 {\n",
" \t\t\tcompatible = \"allwinner,sun7i-a20-i2c\",\n",
" \t\t\t\t \"allwinner,sun4i-a10-i2c\";\n",
"\@\@ -1629,20 +1645,5 \@\@\n",
" \t\t\tinterrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;\n",
" \t\t};\n",
" \n",
- "-\t\tps20: ps2\@01c2a000 {\n",
+ "-\t\tps20: ps2 at 01c2a000 {\n",
"-\t\t\tcompatible = \"allwinner,sun4i-a10-ps2\";\n",
"-\t\t\treg = <0x01c2a000 0x400>;\n",
"-\t\t\tinterrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -106,7 +95,7 @@
"-\t\t\tstatus = \"disabled\";\n",
"-\t\t};\n",
"-\n",
- "-\t\tps21: ps2\@01c2a400 {\n",
+ "-\t\tps21: ps2 at 01c2a400 {\n",
"-\t\t\tcompatible = \"allwinner,sun4i-a10-ps2\";\n",
"-\t\t\treg = <0x01c2a400 0x400>;\n",
"-\t\t\tinterrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -119,4 +108,4 @@
"2.7.4"
]
-845e4c7fc881ac71d1041647d72895bc6908acdcc6fbe18c4c1ad1f91916c7a0
+38800d3db6901b893593e07253fd9a5d3c42a3d57a6273fb6312b04e0b387844
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.