diff for duplicates of <4c2c2fb9987601b5dd7de3ccd70dc2270434b351.1536828567.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 5a05548..302d6f9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -17,7 +17,7 @@ index 5d0109a376c2..11113868f51e 100644
dma-channels = <16>;
};
-+ ohci0: usb@ee080000 {
++ ohci0: usb at ee080000 {
+ compatible = "generic-ohci";
+ reg = <0 0xee080000 0 0x100>;
+ interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
@@ -29,7 +29,7 @@ index 5d0109a376c2..11113868f51e 100644
+ status = "disabled";
+ };
+
-+ ohci1: usb@ee0a0000 {
++ ohci1: usb at ee0a0000 {
+ compatible = "generic-ohci";
+ reg = <0 0xee0a0000 0 0x100>;
+ interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
@@ -41,7 +41,7 @@ index 5d0109a376c2..11113868f51e 100644
+ status = "disabled";
+ };
+
-+ ehci0: usb@ee080100 {
++ ehci0: usb at ee080100 {
+ compatible = "generic-ehci";
+ reg = <0 0xee080100 0 0x100>;
+ interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
@@ -54,7 +54,7 @@ index 5d0109a376c2..11113868f51e 100644
+ status = "disabled";
+ };
+
-+ ehci1: usb@ee0a0100 {
++ ehci1: usb at ee0a0100 {
+ compatible = "generic-ehci";
+ reg = <0 0xee0a0100 0 0x100>;
+ interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
@@ -67,7 +67,7 @@ index 5d0109a376c2..11113868f51e 100644
+ status = "disabled";
+ };
+
-+ usb2_phy0: usb-phy@ee080200 {
++ usb2_phy0: usb-phy at ee080200 {
+ compatible = "renesas,usb2-phy-r8a774a1",
+ "renesas,rcar-gen3-usb2-phy";
+ reg = <0 0xee080200 0 0x700>;
@@ -79,7 +79,7 @@ index 5d0109a376c2..11113868f51e 100644
+ status = "disabled";
+ };
+
-+ usb2_phy1: usb-phy@ee0a0200 {
++ usb2_phy1: usb-phy at ee0a0200 {
+ compatible = "renesas,usb2-phy-r8a774a1",
+ "renesas,rcar-gen3-usb2-phy";
+ reg = <0 0xee0a0200 0 0x700>;
@@ -90,7 +90,7 @@ index 5d0109a376c2..11113868f51e 100644
+ status = "disabled";
+ };
+
- sdhi0: sd@ee100000 {
+ sdhi0: sd at ee100000 {
compatible = "renesas,sdhi-r8a774a1",
"renesas,rcar-gen3-sdhi";
--
diff --git a/a/content_digest b/N1/content_digest
index 127099c..4c71a83 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 37/58] arm64: dts: renesas: r8a774a1: Add USB2.0 phy and host(EHCI/OHCI) device nodes\0"
@@ -11,13 +11,7 @@
"Date\0Thu, 13 Sep 2018 11:09:32 +0200\0"
]
[
- "To\0linux-renesas-soc\@vger.kernel.org\0"
-]
-[
- "Cc\0linux-arm-kernel\@lists.infradead.org",
- " Magnus Damm <magnus.damm\@gmail.com>",
- " Biju Das <biju.das\@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\tohci0: usb\@ee080000 {\n",
+ "+\t\tohci0: usb at ee080000 {\n",
"+\t\t\tcompatible = \"generic-ohci\";\n",
"+\t\t\treg = <0 0xee080000 0 0x100>;\n",
"+\t\t\tinterrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -57,7 +51,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tohci1: usb\@ee0a0000 {\n",
+ "+\t\tohci1: usb at ee0a0000 {\n",
"+\t\t\tcompatible = \"generic-ohci\";\n",
"+\t\t\treg = <0 0xee0a0000 0 0x100>;\n",
"+\t\t\tinterrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -69,7 +63,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tehci0: usb\@ee080100 {\n",
+ "+\t\tehci0: usb at ee080100 {\n",
"+\t\t\tcompatible = \"generic-ehci\";\n",
"+\t\t\treg = <0 0xee080100 0 0x100>;\n",
"+\t\t\tinterrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -82,7 +76,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tehci1: usb\@ee0a0100 {\n",
+ "+\t\tehci1: usb at ee0a0100 {\n",
"+\t\t\tcompatible = \"generic-ehci\";\n",
"+\t\t\treg = <0 0xee0a0100 0 0x100>;\n",
"+\t\t\tinterrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -95,7 +89,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tusb2_phy0: usb-phy\@ee080200 {\n",
+ "+\t\tusb2_phy0: usb-phy at ee080200 {\n",
"+\t\t\tcompatible = \"renesas,usb2-phy-r8a774a1\",\n",
"+\t\t\t\t \"renesas,rcar-gen3-usb2-phy\";\n",
"+\t\t\treg = <0 0xee080200 0 0x700>;\n",
@@ -107,7 +101,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tusb2_phy1: usb-phy\@ee0a0200 {\n",
+ "+\t\tusb2_phy1: usb-phy at ee0a0200 {\n",
"+\t\t\tcompatible = \"renesas,usb2-phy-r8a774a1\",\n",
"+\t\t\t\t \"renesas,rcar-gen3-usb2-phy\";\n",
"+\t\t\treg = <0 0xee0a0200 0 0x700>;\n",
@@ -118,11 +112,11 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- " \t\tsdhi0: sd\@ee100000 {\n",
+ " \t\tsdhi0: sd at ee100000 {\n",
" \t\t\tcompatible = \"renesas,sdhi-r8a774a1\",\n",
" \t\t\t\t \"renesas,rcar-gen3-sdhi\";\n",
"-- \n",
"2.11.0"
]
-9828e85e2079faebefbd6949997d36415ca00588cc6337e9a1426715cd7a1350
+8dc0ad44c1ad0fdc0df1600be0a711e77964b6b58992b8913f91b5894a6186ae
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.