diff for duplicates of <7acc17b1a3e96d1e541c48abd89fa74d1e752f15.1536828567.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index c75379a..94abfd4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -35,13 +35,13 @@ index a8e8f2669d4c..e39b73005381 100644
- #address-cells = <1>;
- #size-cells = <0>;
-
-- port@0 {
+- port at 0 {
- reg = <0>;
- adv7123_in: endpoint {
- remote-endpoint = <&du_out_rgb>;
- };
- };
-- port@1 {
+- port at 1 {
- reg = <1>;
- adv7123_out: endpoint {
- remote-endpoint = <&vga_in>;
@@ -100,13 +100,13 @@ index a8e8f2669d4c..e39b73005381 100644
- i2c1_pins: i2c1 {
- groups = "i2c1";
- function = "i2c1";
-+ port@0 {
++ port at 0 {
+ reg = <0>;
+ adv7123_in: endpoint {
+ remote-endpoint = <&du_out_rgb>;
+ };
+ };
-+ port@1 {
++ port at 1 {
+ reg = <1>;
+ adv7123_out: endpoint {
+ remote-endpoint = <&vga_in>;
@@ -140,7 +140,7 @@ index a8e8f2669d4c..e39b73005381 100644
- scif2_pins: scif2 {
- groups = "scif2_data";
- function = "scif2";
-+ phy0: ethernet-phy@0 {
++ phy0: ethernet-phy at 0 {
+ rxc-skew-ps = <1500>;
+ reg = <0>;
+ interrupt-parent = <&gpio5>;
@@ -172,7 +172,7 @@ index a8e8f2669d4c..e39b73005381 100644
- groups = "usb0";
- function = "usb0";
+ ports {
-+ port@0 {
++ port at 0 {
+ endpoint {
+ remote-endpoint = <&adv7123_in>;
+ };
@@ -197,13 +197,13 @@ index a8e8f2669d4c..e39b73005381 100644
pinctrl-names = "default";
status = "okay";
-- eeprom@50 {
+- eeprom at 50 {
- compatible = "rohm,br24t01", "atmel,24c01";
- reg = <0x50>;
- pagesize = <8>;
- };
-
- composite-in@20 {
+ composite-in at 20 {
compatible = "adi,adv7180cp";
reg = <0x20>;
@@ -254,6 +226,12 @@
@@ -211,7 +211,7 @@ index a8e8f2669d4c..e39b73005381 100644
};
};
+
-+ eeprom@50 {
++ eeprom at 50 {
+ compatible = "rohm,br24t01", "atmel,24c01";
+ reg = <0x50>;
+ pagesize = <8>;
@@ -236,7 +236,7 @@ index a8e8f2669d4c..e39b73005381 100644
- clock-names = "du.0", "du.1", "dclkin.0";
-
- ports {
-- port@0 {
+- port at 0 {
- endpoint {
- remote-endpoint = <&adv7123_in>;
- };
@@ -324,7 +324,7 @@ index a8e8f2669d4c..e39b73005381 100644
status = "okay";
+};
-- phy0: ethernet-phy@0 {
+- phy0: ethernet-phy at 0 {
- rxc-skew-ps = <1500>;
- reg = <0>;
- interrupt-parent = <&gpio5>;
diff --git a/a/content_digest b/N1/content_digest
index 2b10af6..9ee541d 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 57/58] arm64: dts: renesas: draak: Sort device nodes\0"
@@ -11,13 +11,7 @@
"Date\0Thu, 13 Sep 2018 11:09:52 +0200\0"
]
[
- "To\0linux-renesas-soc\@vger.kernel.org\0"
-]
-[
- "Cc\0linux-arm-kernel\@lists.infradead.org",
- " Magnus Damm <magnus.damm\@gmail.com>",
- " Geert Uytterhoeven <geert+renesas\@glider.be>",
- " Simon Horman <horms+renesas\@verge.net.au>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -63,13 +57,13 @@
"-\t\t\t#address-cells = <1>;\n",
"-\t\t\t#size-cells = <0>;\n",
"-\n",
- "-\t\t\tport\@0 {\n",
+ "-\t\t\tport at 0 {\n",
"-\t\t\t\treg = <0>;\n",
"-\t\t\t\tadv7123_in: endpoint {\n",
"-\t\t\t\t\tremote-endpoint = <&du_out_rgb>;\n",
"-\t\t\t\t};\n",
"-\t\t\t};\n",
- "-\t\t\tport\@1 {\n",
+ "-\t\t\tport at 1 {\n",
"-\t\t\t\treg = <1>;\n",
"-\t\t\t\tadv7123_out: endpoint {\n",
"-\t\t\t\t\tremote-endpoint = <&vga_in>;\n",
@@ -128,13 +122,13 @@
"-\ti2c1_pins: i2c1 {\n",
"-\t\tgroups = \"i2c1\";\n",
"-\t\tfunction = \"i2c1\";\n",
- "+\t\t\tport\@0 {\n",
+ "+\t\t\tport at 0 {\n",
"+\t\t\t\treg = <0>;\n",
"+\t\t\t\tadv7123_in: endpoint {\n",
"+\t\t\t\t\tremote-endpoint = <&du_out_rgb>;\n",
"+\t\t\t\t};\n",
"+\t\t\t};\n",
- "+\t\t\tport\@1 {\n",
+ "+\t\t\tport at 1 {\n",
"+\t\t\t\treg = <1>;\n",
"+\t\t\t\tadv7123_out: endpoint {\n",
"+\t\t\t\t\tremote-endpoint = <&vga_in>;\n",
@@ -168,7 +162,7 @@
"-\tscif2_pins: scif2 {\n",
"-\t\tgroups = \"scif2_data\";\n",
"-\t\tfunction = \"scif2\";\n",
- "+\tphy0: ethernet-phy\@0 {\n",
+ "+\tphy0: ethernet-phy at 0 {\n",
"+\t\trxc-skew-ps = <1500>;\n",
"+\t\treg = <0>;\n",
"+\t\tinterrupt-parent = <&gpio5>;\n",
@@ -200,7 +194,7 @@
"-\t\tgroups = \"usb0\";\n",
"-\t\tfunction = \"usb0\";\n",
"+\tports {\n",
- "+\t\tport\@0 {\n",
+ "+\t\tport at 0 {\n",
"+\t\t\tendpoint {\n",
"+\t\t\t\tremote-endpoint = <&adv7123_in>;\n",
"+\t\t\t};\n",
@@ -225,13 +219,13 @@
" \tpinctrl-names = \"default\";\n",
" \tstatus = \"okay\";\n",
" \n",
- "-\teeprom\@50 {\n",
+ "-\teeprom at 50 {\n",
"-\t\tcompatible = \"rohm,br24t01\", \"atmel,24c01\";\n",
"-\t\treg = <0x50>;\n",
"-\t\tpagesize = <8>;\n",
"-\t};\n",
"-\n",
- " \tcomposite-in\@20 {\n",
+ " \tcomposite-in at 20 {\n",
" \t\tcompatible = \"adi,adv7180cp\";\n",
" \t\treg = <0x20>;\n",
"\@\@ -254,6 +226,12 \@\@\n",
@@ -239,7 +233,7 @@
" \t\t};\n",
" \t};\n",
"+\n",
- "+\teeprom\@50 {\n",
+ "+\teeprom at 50 {\n",
"+\t\tcompatible = \"rohm,br24t01\", \"atmel,24c01\";\n",
"+\t\treg = <0x50>;\n",
"+\t\tpagesize = <8>;\n",
@@ -264,7 +258,7 @@
"-\tclock-names = \"du.0\", \"du.1\", \"dclkin.0\";\n",
"-\n",
"-\tports {\n",
- "-\t\tport\@0 {\n",
+ "-\t\tport at 0 {\n",
"-\t\t\tendpoint {\n",
"-\t\t\t\tremote-endpoint = <&adv7123_in>;\n",
"-\t\t\t};\n",
@@ -352,7 +346,7 @@
" \tstatus = \"okay\";\n",
"+};\n",
" \n",
- "-\tphy0: ethernet-phy\@0 {\n",
+ "-\tphy0: ethernet-phy at 0 {\n",
"-\t\trxc-skew-ps = <1500>;\n",
"-\t\treg = <0>;\n",
"-\t\tinterrupt-parent = <&gpio5>;\n",
@@ -394,4 +388,4 @@
"2.11.0"
]
-5cf99a601d205497c76ac7b9753ec4821c56d09ac18a0b7164223660c8d64bc9
+3b4f8e476b8d89e468423bbb1c5905f760040b2f3e016362c875389afc0cee86
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.