diff for duplicates of <20180419093225.614-7-wens@csie.org>
diff --git a/a/1.txt b/N1/1.txt
index 9113aee..62c969e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -46,13 +46,13 @@ index 763cb03033c4..58a923bfa6ef 100644
+ #address-cells = <1>;
+ #size-cells = <0>;
+
-+ port@0 {
++ port at 0 {
+ reg = <0>;
+ backlight = <&lcd_backlight>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
-+ lcd_panel_input: endpoint@0 {
++ lcd_panel_input: endpoint at 0 {
+ reg = <0>;
+ remote-endpoint = <&tcon0_out_lcd>;
+ };
@@ -71,7 +71,7 @@ index 763cb03033c4..58a923bfa6ef 100644
+ pinctrl-0 = <&i2c3_pins_a>;
+ status = "okay";
+
-+ touchscreen@38 {
++ touchscreen at 38 {
+ compatible = "edt,edt-ft5306", "edt,edt-ft5x06";
+ reg = <0x38>;
+ interrupt-parent = <&pio>;
@@ -106,7 +106,7 @@ index 763cb03033c4..58a923bfa6ef 100644
+};
+
+&tcon0_out {
-+ tcon0_out_lcd: endpoint@0 {
++ tcon0_out_lcd: endpoint at 0 {
+ reg = <0>;
+ remote-endpoint = <&lcd_panel_input>;
+ };
diff --git a/a/content_digest b/N1/content_digest
index 29b774c..6199a24 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\00020180419093225.614-1-wens\@csie.org\0"
]
[
- "From\0Chen-Yu Tsai <wens\@csie.org>\0"
+ "From\0wens\@csie.org (Chen-Yu Tsai)\0"
]
[
"Subject\0[PATCH 6/6] [DO NOT MERGE] ARM: dts: sun7i: bananapi-m1-plus: Enable Bananapi 7\" 800x480 RGB LCD panel\0"
@@ -11,19 +11,7 @@
"Date\0Thu, 19 Apr 2018 17:32:25 +0800\0"
]
[
- "To\0Maxime Ripard <maxime.ripard\@bootlin.com>",
- " David Airlie <airlied\@linux.ie>",
- " Thierry Reding <thierry.reding\@gmail.com>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Mark Rutland <mark.rutland\@arm.com>\0"
-]
-[
- "Cc\0Chen-Yu Tsai <wens\@csie.org>",
- " dri-devel\@lists.freedesktop.org",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-kernel\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
- " Jonathan Liu <net147\@gmail.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -80,13 +68,13 @@
"+\t\t#address-cells = <1>;\n",
"+\t\t#size-cells = <0>;\n",
"+\n",
- "+\t\tport\@0 {\n",
+ "+\t\tport at 0 {\n",
"+\t\t\treg = <0>;\n",
"+\t\t\tbacklight = <&lcd_backlight>;\n",
"+\t\t\t#address-cells = <1>;\n",
"+\t\t\t#size-cells = <0>;\n",
"+\n",
- "+\t\t\tlcd_panel_input: endpoint\@0 {\n",
+ "+\t\t\tlcd_panel_input: endpoint at 0 {\n",
"+\t\t\t\treg = <0>;\n",
"+\t\t\t\tremote-endpoint = <&tcon0_out_lcd>;\n",
"+\t\t\t};\n",
@@ -105,7 +93,7 @@
"+\tpinctrl-0 = <&i2c3_pins_a>;\n",
"+\tstatus = \"okay\";\n",
"+\n",
- "+\ttouchscreen\@38 {\n",
+ "+\ttouchscreen at 38 {\n",
"+\t\tcompatible = \"edt,edt-ft5306\", \"edt,edt-ft5x06\";\n",
"+\t\treg = <0x38>;\n",
"+\t\tinterrupt-parent = <&pio>;\n",
@@ -140,7 +128,7 @@
"+};\n",
"+\n",
"+&tcon0_out {\n",
- "+\ttcon0_out_lcd: endpoint\@0 {\n",
+ "+\ttcon0_out_lcd: endpoint at 0 {\n",
"+\t\treg = <0>;\n",
"+\t\tremote-endpoint = <&lcd_panel_input>;\n",
"+\t};\n",
@@ -153,4 +141,4 @@
"2.17.0"
]
-fe699f9ebefb2bc6fe94d47d185ea38efd4d753a19a0e10f3e99d6c600266f61
+69233da67c72c6f98395910616ca1559a930ef0df7b94862332e1db5197d4ecc
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.