diff for duplicates of <1462910970-1812-22-git-send-email-krzk@kernel.org>
diff --git a/a/1.txt b/N1/1.txt
index 5f40c7b..13730c2 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -90,7 +90,7 @@ index ebf2ed3c5ff8..8fa65eb8027d 100644
- #size-cells = <1>;
- ranges;
-
-- usbdrd_dwc3_0: dwc3@12000000 {
+- usbdrd_dwc3_0: dwc3 at 12000000 {
- compatible = "snps,dwc3";
- reg = <0x12000000 0x10000>;
- interrupts = <0 72 0>;
@@ -99,7 +99,7 @@ index ebf2ed3c5ff8..8fa65eb8027d 100644
- };
- };
-
-- usbdrd_phy0: phy@12100000 {
+- usbdrd_phy0: phy at 12100000 {
- compatible = "samsung,exynos5420-usbdrd-phy";
- reg = <0x12100000 0x100>;
- clocks = <&clock CLK_USBD300>, <&clock CLK_SCLK_USBPHY300>;
@@ -116,7 +116,7 @@ index ebf2ed3c5ff8..8fa65eb8027d 100644
- #size-cells = <1>;
- ranges;
-
-- usbdrd_dwc3_1: dwc3@12400000 {
+- usbdrd_dwc3_1: dwc3 at 12400000 {
- compatible = "snps,dwc3";
- reg = <0x12400000 0x10000>;
- interrupts = <0 73 0>;
@@ -125,7 +125,7 @@ index ebf2ed3c5ff8..8fa65eb8027d 100644
- };
- };
-
-- usbdrd_phy1: phy@12500000 {
+- usbdrd_phy1: phy at 12500000 {
- compatible = "samsung,exynos5420-usbdrd-phy";
- reg = <0x12500000 0x100>;
- clocks = <&clock CLK_USBD301>, <&clock CLK_SCLK_USBPHY301>;
@@ -134,7 +134,7 @@ index ebf2ed3c5ff8..8fa65eb8027d 100644
- #phy-cells = <1>;
- };
-
-- usbhost2: usb@12110000 {
+- usbhost2: usb at 12110000 {
- compatible = "samsung,exynos4210-ehci";
- reg = <0x12110000 0x100>;
- interrupts = <0 71 0>;
@@ -143,13 +143,13 @@ index ebf2ed3c5ff8..8fa65eb8027d 100644
- clock-names = "usbhost";
- #address-cells = <1>;
- #size-cells = <0>;
-- port@0 {
+- port at 0 {
- reg = <0>;
- phys = <&usb2_phy 1>;
- };
- };
-
-- usbhost1: usb@12120000 {
+- usbhost1: usb at 12120000 {
- compatible = "samsung,exynos4210-ohci";
- reg = <0x12120000 0x100>;
- interrupts = <0 71 0>;
@@ -158,13 +158,13 @@ index ebf2ed3c5ff8..8fa65eb8027d 100644
- clock-names = "usbhost";
- #address-cells = <1>;
- #size-cells = <0>;
-- port@0 {
+- port at 0 {
- reg = <0>;
- phys = <&usb2_phy 1>;
- };
- };
-
-- usb2_phy: phy@12130000 {
+- usb2_phy: phy at 12130000 {
- compatible = "samsung,exynos5250-usb2-phy";
- reg = <0x12130000 0x100>;
- clocks = <&clock CLK_USBH20>, <&clock CLK_SCLK_USBPHY300>;
@@ -174,7 +174,7 @@ index ebf2ed3c5ff8..8fa65eb8027d 100644
- samsung,pmureg-phandle = <&pmu_system_controller>;
- };
-
- sysmmu_g2dr: sysmmu@0x10A60000 {
+ sysmmu_g2dr: sysmmu at 0x10A60000 {
compatible = "samsung,exynos-sysmmu";
reg = <0x10A60000 0x1000>;
@@ -1153,4 +1059,43 @@
@@ -235,7 +235,7 @@ index 9ce625bd79c1..a9a062708237 100644
+ };
+
soc: soc {
- sysram@02020000 {
+ sysram at 02020000 {
compatible = "mmio-sram";
@@ -64,5 +69,79 @@
<11 &gic 0 131 0>;
@@ -248,7 +248,7 @@ index 9ce625bd79c1..a9a062708237 100644
+ #size-cells = <1>;
+ ranges;
+
-+ usbdrd_dwc3_0: dwc3@12000000 {
++ usbdrd_dwc3_0: dwc3 at 12000000 {
+ compatible = "snps,dwc3";
+ reg = <0x12000000 0x10000>;
+ interrupts = <0 72 0>;
@@ -257,7 +257,7 @@ index 9ce625bd79c1..a9a062708237 100644
+ };
+ };
+
-+ usbdrd_phy0: phy@12100000 {
++ usbdrd_phy0: phy at 12100000 {
+ compatible = "samsung,exynos5420-usbdrd-phy";
+ reg = <0x12100000 0x100>;
+ #phy-cells = <1>;
@@ -269,7 +269,7 @@ index 9ce625bd79c1..a9a062708237 100644
+ #size-cells = <1>;
+ ranges;
+
-+ usbdrd_dwc3_1: dwc3@12400000 {
++ usbdrd_dwc3_1: dwc3 at 12400000 {
+ compatible = "snps,dwc3";
+ reg = <0x12400000 0x10000>;
+ interrupts = <0 73 0>;
@@ -278,39 +278,39 @@ index 9ce625bd79c1..a9a062708237 100644
+ };
+ };
+
-+ usbdrd_phy1: phy@12500000 {
++ usbdrd_phy1: phy at 12500000 {
+ compatible = "samsung,exynos5420-usbdrd-phy";
+ reg = <0x12500000 0x100>;
+ #phy-cells = <1>;
+ };
+
-+ usbhost2: usb@12110000 {
++ usbhost2: usb at 12110000 {
+ compatible = "samsung,exynos4210-ehci";
+ reg = <0x12110000 0x100>;
+ interrupts = <0 71 0>;
+
+ #address-cells = <1>;
+ #size-cells = <0>;
-+ port@0 {
++ port at 0 {
+ reg = <0>;
+ phys = <&usb2_phy 1>;
+ };
+ };
+
-+ usbhost1: usb@12120000 {
++ usbhost1: usb at 12120000 {
+ compatible = "samsung,exynos4210-ohci";
+ reg = <0x12120000 0x100>;
+ interrupts = <0 71 0>;
+
+ #address-cells = <1>;
+ #size-cells = <0>;
-+ port@0 {
++ port at 0 {
+ reg = <0>;
+ phys = <&usb2_phy 1>;
+ };
+ };
+
-+ usb2_phy: phy@12130000 {
++ usb2_phy: phy at 12130000 {
+ compatible = "samsung,exynos5250-usb2-phy";
+ reg = <0x12130000 0x100>;
+ #phy-cells = <1>;
diff --git a/a/content_digest b/N1/content_digest
index 175983d..38fbc73 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001462910970-1812-1-git-send-email-krzk\@kernel.org\0"
]
[
- "From\0Krzysztof Kozlowski <krzk\@kernel.org>\0"
+ "From\0krzk\@kernel.org (Krzysztof Kozlowski)\0"
]
[
"Subject\0[PATCH v3 21/27] ARM: dts: exynos: Add USB to Exynos5410\0"
@@ -11,22 +11,7 @@
"Date\0Tue, 10 May 2016 22:09:24 +0200\0"
]
[
- "To\0Kukjin Kim <kgene\@kernel.org>",
- " Krzysztof Kozlowski <k.kozlowski\@samsung.com>",
- " Sylwester Nawrocki <s.nawrocki\@samsung.com>",
- " Tomasz Figa <tomasz.figa\@gmail.com>",
- " Michael Turquette <mturquette\@baylibre.com>",
- " Stephen Boyd <sboyd\@codeaurora.org>",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-samsung-soc\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-clk\@vger.kernel.org\0"
-]
-[
- "Cc\0Javier Martinez Canillas <javier\@osg.samsung.com>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Krzysztof Kozlowski <krzk\@kernel.org>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -127,7 +112,7 @@
"-\t\t\t#size-cells = <1>;\n",
"-\t\t\tranges;\n",
"-\n",
- "-\t\t\tusbdrd_dwc3_0: dwc3\@12000000 {\n",
+ "-\t\t\tusbdrd_dwc3_0: dwc3 at 12000000 {\n",
"-\t\t\t\tcompatible = \"snps,dwc3\";\n",
"-\t\t\t\treg = <0x12000000 0x10000>;\n",
"-\t\t\t\tinterrupts = <0 72 0>;\n",
@@ -136,7 +121,7 @@
"-\t\t\t};\n",
"-\t\t};\n",
"-\n",
- "-\t\tusbdrd_phy0: phy\@12100000 {\n",
+ "-\t\tusbdrd_phy0: phy at 12100000 {\n",
"-\t\t\tcompatible = \"samsung,exynos5420-usbdrd-phy\";\n",
"-\t\t\treg = <0x12100000 0x100>;\n",
"-\t\t\tclocks = <&clock CLK_USBD300>, <&clock CLK_SCLK_USBPHY300>;\n",
@@ -153,7 +138,7 @@
"-\t\t\t#size-cells = <1>;\n",
"-\t\t\tranges;\n",
"-\n",
- "-\t\t\tusbdrd_dwc3_1: dwc3\@12400000 {\n",
+ "-\t\t\tusbdrd_dwc3_1: dwc3 at 12400000 {\n",
"-\t\t\t\tcompatible = \"snps,dwc3\";\n",
"-\t\t\t\treg = <0x12400000 0x10000>;\n",
"-\t\t\t\tinterrupts = <0 73 0>;\n",
@@ -162,7 +147,7 @@
"-\t\t\t};\n",
"-\t\t};\n",
"-\n",
- "-\t\tusbdrd_phy1: phy\@12500000 {\n",
+ "-\t\tusbdrd_phy1: phy at 12500000 {\n",
"-\t\t\tcompatible = \"samsung,exynos5420-usbdrd-phy\";\n",
"-\t\t\treg = <0x12500000 0x100>;\n",
"-\t\t\tclocks = <&clock CLK_USBD301>, <&clock CLK_SCLK_USBPHY301>;\n",
@@ -171,7 +156,7 @@
"-\t\t\t#phy-cells = <1>;\n",
"-\t\t};\n",
"-\n",
- "-\t\tusbhost2: usb\@12110000 {\n",
+ "-\t\tusbhost2: usb at 12110000 {\n",
"-\t\t\tcompatible = \"samsung,exynos4210-ehci\";\n",
"-\t\t\treg = <0x12110000 0x100>;\n",
"-\t\t\tinterrupts = <0 71 0>;\n",
@@ -180,13 +165,13 @@
"-\t\t\tclock-names = \"usbhost\";\n",
"-\t\t\t#address-cells = <1>;\n",
"-\t\t\t#size-cells = <0>;\n",
- "-\t\t\tport\@0 {\n",
+ "-\t\t\tport at 0 {\n",
"-\t\t\t\treg = <0>;\n",
"-\t\t\t\tphys = <&usb2_phy 1>;\n",
"-\t\t\t};\n",
"-\t\t};\n",
"-\n",
- "-\t\tusbhost1: usb\@12120000 {\n",
+ "-\t\tusbhost1: usb at 12120000 {\n",
"-\t\t\tcompatible = \"samsung,exynos4210-ohci\";\n",
"-\t\t\treg = <0x12120000 0x100>;\n",
"-\t\t\tinterrupts = <0 71 0>;\n",
@@ -195,13 +180,13 @@
"-\t\t\tclock-names = \"usbhost\";\n",
"-\t\t\t#address-cells = <1>;\n",
"-\t\t\t#size-cells = <0>;\n",
- "-\t\t\tport\@0 {\n",
+ "-\t\t\tport at 0 {\n",
"-\t\t\t\treg = <0>;\n",
"-\t\t\t\tphys = <&usb2_phy 1>;\n",
"-\t\t\t};\n",
"-\t\t};\n",
"-\n",
- "-\t\tusb2_phy: phy\@12130000 {\n",
+ "-\t\tusb2_phy: phy at 12130000 {\n",
"-\t\t\tcompatible = \"samsung,exynos5250-usb2-phy\";\n",
"-\t\t\treg = <0x12130000 0x100>;\n",
"-\t\t\tclocks = <&clock CLK_USBH20>, <&clock CLK_SCLK_USBPHY300>;\n",
@@ -211,7 +196,7 @@
"-\t\t\tsamsung,pmureg-phandle = <&pmu_system_controller>;\n",
"-\t\t};\n",
"-\n",
- " \t\tsysmmu_g2dr: sysmmu\@0x10A60000 {\n",
+ " \t\tsysmmu_g2dr: sysmmu at 0x10A60000 {\n",
" \t\t\tcompatible = \"samsung,exynos-sysmmu\";\n",
" \t\t\treg = <0x10A60000 0x1000>;\n",
"\@\@ -1153,4 +1059,43 \@\@\n",
@@ -272,7 +257,7 @@
"+\t};\n",
"+\n",
" \tsoc: soc {\n",
- " \t\tsysram\@02020000 {\n",
+ " \t\tsysram at 02020000 {\n",
" \t\t\tcompatible = \"mmio-sram\";\n",
"\@\@ -64,5 +69,79 \@\@\n",
" \t\t\t\t\t\t<11 &gic 0 131 0>;\n",
@@ -285,7 +270,7 @@
"+\t\t\t#size-cells = <1>;\n",
"+\t\t\tranges;\n",
"+\n",
- "+\t\t\tusbdrd_dwc3_0: dwc3\@12000000 {\n",
+ "+\t\t\tusbdrd_dwc3_0: dwc3 at 12000000 {\n",
"+\t\t\t\tcompatible = \"snps,dwc3\";\n",
"+\t\t\t\treg = <0x12000000 0x10000>;\n",
"+\t\t\t\tinterrupts = <0 72 0>;\n",
@@ -294,7 +279,7 @@
"+\t\t\t};\n",
"+\t\t};\n",
"+\n",
- "+\t\tusbdrd_phy0: phy\@12100000 {\n",
+ "+\t\tusbdrd_phy0: phy at 12100000 {\n",
"+\t\t\tcompatible = \"samsung,exynos5420-usbdrd-phy\";\n",
"+\t\t\treg = <0x12100000 0x100>;\n",
"+\t\t\t#phy-cells = <1>;\n",
@@ -306,7 +291,7 @@
"+\t\t\t#size-cells = <1>;\n",
"+\t\t\tranges;\n",
"+\n",
- "+\t\t\tusbdrd_dwc3_1: dwc3\@12400000 {\n",
+ "+\t\t\tusbdrd_dwc3_1: dwc3 at 12400000 {\n",
"+\t\t\t\tcompatible = \"snps,dwc3\";\n",
"+\t\t\t\treg = <0x12400000 0x10000>;\n",
"+\t\t\t\tinterrupts = <0 73 0>;\n",
@@ -315,39 +300,39 @@
"+\t\t\t};\n",
"+\t\t};\n",
"+\n",
- "+\t\tusbdrd_phy1: phy\@12500000 {\n",
+ "+\t\tusbdrd_phy1: phy at 12500000 {\n",
"+\t\t\tcompatible = \"samsung,exynos5420-usbdrd-phy\";\n",
"+\t\t\treg = <0x12500000 0x100>;\n",
"+\t\t\t#phy-cells = <1>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tusbhost2: usb\@12110000 {\n",
+ "+\t\tusbhost2: usb at 12110000 {\n",
"+\t\t\tcompatible = \"samsung,exynos4210-ehci\";\n",
"+\t\t\treg = <0x12110000 0x100>;\n",
"+\t\t\tinterrupts = <0 71 0>;\n",
"+\n",
"+\t\t\t#address-cells = <1>;\n",
"+\t\t\t#size-cells = <0>;\n",
- "+\t\t\tport\@0 {\n",
+ "+\t\t\tport at 0 {\n",
"+\t\t\t\treg = <0>;\n",
"+\t\t\t\tphys = <&usb2_phy 1>;\n",
"+\t\t\t};\n",
"+\t\t};\n",
"+\n",
- "+\t\tusbhost1: usb\@12120000 {\n",
+ "+\t\tusbhost1: usb at 12120000 {\n",
"+\t\t\tcompatible = \"samsung,exynos4210-ohci\";\n",
"+\t\t\treg = <0x12120000 0x100>;\n",
"+\t\t\tinterrupts = <0 71 0>;\n",
"+\n",
"+\t\t\t#address-cells = <1>;\n",
"+\t\t\t#size-cells = <0>;\n",
- "+\t\t\tport\@0 {\n",
+ "+\t\t\tport at 0 {\n",
"+\t\t\t\treg = <0>;\n",
"+\t\t\t\tphys = <&usb2_phy 1>;\n",
"+\t\t\t};\n",
"+\t\t};\n",
"+\n",
- "+\t\tusb2_phy: phy\@12130000 {\n",
+ "+\t\tusb2_phy: phy at 12130000 {\n",
"+\t\t\tcompatible = \"samsung,exynos5250-usb2-phy\";\n",
"+\t\t\treg = <0x12130000 0x100>;\n",
"+\t\t\t#phy-cells = <1>;\n",
@@ -358,4 +343,4 @@
"2.5.0"
]
-f2af218771d49a32f665ea79dff13cf2057f2015246469e43523c855d0632508
+f95158b784228dc28c89ef7158e2420f813862cadf29a8631f2c6a9d3f9417db
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.