diff for duplicates of <fe3794e1-2452-d1af-5c30-203fcbb9932e@cogentembedded.com>
diff --git a/a/content_digest b/N1/content_digest
index 0c9fb20..8f5f848 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -19,8 +19,8 @@
" devicetree\@vger.kernel.org\0"
]
[
- "Cc\0Mark Rutland <mark.rutland\@arm.com>",
- " Magnus Damm <magnus.damm\@gmail.com>",
+ "Cc\0Magnus Damm <magnus.damm\@gmail.com>",
+ " Mark Rutland <mark.rutland\@arm.com>",
" linux-arm-kernel\@lists.infradead.org\0"
]
[
@@ -346,4 +346,4 @@
" \t\tfunction = \"scif0\";"
]
-c426c0ae564d9cfe9422935b801ceb8ac1e9a60297c1a77e42b120793cf7c744
+52438703e11f3c5653a5c5c32a1864a2844eadf247e28714b0f9dfd076e31d64
diff --git a/a/1.txt b/N2/1.txt
index 6aedc86..ef3ece6 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -64,14 +64,14 @@ Index: renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
+ #address-cells = <1>;
+ #size-cells = <0>;
+
-+ port@0 {
++ port at 0 {
+ reg = <0>;
+ thc63lvd1024_in: endpoint {
+ remote-endpoint = <&lvds0_out>;
+ };
+ };
+
-+ port@2 {
++ port at 2 {
+ reg = <2>;
+ thc63lvd1024_out: endpoint {
+ remote-endpoint = <&adv7511_in>;
@@ -107,7 +107,7 @@ Index: renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
#gpio-cells = <2>;
};
+
-+ hdmi@39 {
++ hdmi at 39 {
+ compatible = "adi,adv7511w";
+ reg = <0x39>;
+ interrupt-parent = <&gpio1>;
@@ -128,14 +128,14 @@ Index: renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
+ #address-cells = <1>;
+ #size-cells = <0>;
+
-+ port@0 {
++ port at 0 {
+ reg = <0>;
+ adv7511_in: endpoint {
+ remote-endpoint = <&thc63lvd1024_out>;
+ };
+ };
+
-+ port@1 {
++ port at 1 {
+ reg = <1>;
+ adv7511_out: endpoint {
+ remote-endpoint = <&hdmi_con>;
@@ -149,7 +149,7 @@ Index: renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
+ status = "okay";
+
+ ports {
-+ port@1 {
++ port at 1 {
+ lvds0_out: endpoint {
+ remote-endpoint = <&thc63lvd1024_in>;
+ };
@@ -186,14 +186,14 @@ Index: renesas/arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts
+ #address-cells = <1>;
+ #size-cells = <0>;
+
-+ port@0 {
++ port at 0 {
+ reg = <0>;
+ thc63lvd1024_in: endpoint {
+ remote-endpoint = <&lvds0_out>;
+ };
+ };
+
-+ port@2 {
++ port at 2 {
+ reg = <2>;
+ thc63lvd1024_out: endpoint {
+ remote-endpoint = <&adv7511_in>;
@@ -243,7 +243,7 @@ Index: renesas/arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts
+ status = "okay";
+
+ ports {
-+ port@1 {
++ port at 1 {
+ lvds0_out: endpoint {
+ remote-endpoint = <&thc63lvd1024_in>;
+ };
@@ -258,7 +258,7 @@ Index: renesas/arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts
+ status = "okay";
+ clock-frequency = <400000>;
+
-+ hdmi@39 {
++ hdmi at 39 {
+ compatible = "adi,adv7511w";
+ #sound-dai-cells = <0>;
+ reg = <0x39>;
@@ -280,14 +280,14 @@ Index: renesas/arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts
+ #address-cells = <1>;
+ #size-cells = <0>;
+
-+ port@0 {
++ port at 0 {
+ reg = <0>;
+ adv7511_in: endpoint {
+ remote-endpoint = <&thc63lvd1024_out>;
+ };
+ };
+
-+ port@1 {
++ port at 1 {
+ reg = <1>;
+ adv7511_out: endpoint {
+ remote-endpoint = <&hdmi_con>;
diff --git a/a/content_digest b/N2/content_digest
index 0c9fb20..6c147d0 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\00095d0db34-713d-8206-00c2-ee9a42aab823\@cogentembedded.com\0"
]
[
- "From\0Sergei Shtylyov <sergei.shtylyov\@cogentembedded.com>\0"
+ "From\0sergei.shtylyov\@cogentembedded.com (Sergei Shtylyov)\0"
]
[
"Subject\0[PATCH v4] arm64: dts: renesas: condor/v3hsk: add DU/LVDS/HDMI support\0"
@@ -11,17 +11,7 @@
"Date\0Thu, 23 Aug 2018 19:59:20 +0300\0"
]
[
- "To\0Simon Horman <horms\@verge.net.au>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Catalin Marinas <catalin.marinas\@arm.com>",
- " Will Deacon <will.deacon\@arm.com>",
- " linux-renesas-soc\@vger.kernel.org",
- " devicetree\@vger.kernel.org\0"
-]
-[
- "Cc\0Mark Rutland <mark.rutland\@arm.com>",
- " Magnus Damm <magnus.damm\@gmail.com>",
- " linux-arm-kernel\@lists.infradead.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -96,14 +86,14 @@
"+\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\tthc63lvd1024_in: endpoint {\n",
"+\t\t\t\t\tremote-endpoint = <&lvds0_out>;\n",
"+\t\t\t\t};\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tport\@2 {\n",
+ "+\t\t\tport at 2 {\n",
"+\t\t\t\treg = <2>;\n",
"+\t\t\t\tthc63lvd1024_out: endpoint {\n",
"+\t\t\t\t\tremote-endpoint = <&adv7511_in>;\n",
@@ -139,7 +129,7 @@
" \t\t#gpio-cells = <2>;\n",
" \t};\n",
"+\n",
- "+\thdmi\@39 {\n",
+ "+\thdmi at 39 {\n",
"+\t\tcompatible = \"adi,adv7511w\";\n",
"+\t\treg = <0x39>;\n",
"+\t\tinterrupt-parent = <&gpio1>;\n",
@@ -160,14 +150,14 @@
"+\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\tadv7511_in: endpoint {\n",
"+\t\t\t\t\tremote-endpoint = <&thc63lvd1024_out>;\n",
"+\t\t\t\t};\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tport\@1 {\n",
+ "+\t\t\tport at 1 {\n",
"+\t\t\t\treg = <1>;\n",
"+\t\t\t\tadv7511_out: endpoint {\n",
"+\t\t\t\t\tremote-endpoint = <&hdmi_con>;\n",
@@ -181,7 +171,7 @@
"+\tstatus = \"okay\";\n",
"+\n",
"+\tports {\n",
- "+\t\tport\@1 {\n",
+ "+\t\tport at 1 {\n",
"+\t\t\tlvds0_out: endpoint {\n",
"+\t\t\t\tremote-endpoint = <&thc63lvd1024_in>;\n",
"+\t\t\t};\n",
@@ -218,14 +208,14 @@
"+\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\tthc63lvd1024_in: endpoint {\n",
"+\t\t\t\t\tremote-endpoint = <&lvds0_out>;\n",
"+\t\t\t\t};\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tport\@2 {\n",
+ "+\t\t\tport at 2 {\n",
"+\t\t\t\treg = <2>;\n",
"+\t\t\t\tthc63lvd1024_out: endpoint {\n",
"+\t\t\t\t\tremote-endpoint = <&adv7511_in>;\n",
@@ -275,7 +265,7 @@
"+\tstatus = \"okay\";\n",
"+\n",
"+\tports {\n",
- "+\t\tport\@1 {\n",
+ "+\t\tport at 1 {\n",
"+\t\t\tlvds0_out: endpoint {\n",
"+\t\t\t\tremote-endpoint = <&thc63lvd1024_in>;\n",
"+\t\t\t};\n",
@@ -290,7 +280,7 @@
"+\tstatus = \"okay\";\n",
"+\tclock-frequency = <400000>;\n",
"+\n",
- "+\thdmi\@39 {\n",
+ "+\thdmi at 39 {\n",
"+\t\tcompatible = \"adi,adv7511w\";\n",
"+\t\t#sound-dai-cells = <0>;\n",
"+\t\treg = <0x39>;\n",
@@ -312,14 +302,14 @@
"+\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\tadv7511_in: endpoint {\n",
"+\t\t\t\t\tremote-endpoint = <&thc63lvd1024_out>;\n",
"+\t\t\t\t};\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tport\@1 {\n",
+ "+\t\t\tport at 1 {\n",
"+\t\t\t\treg = <1>;\n",
"+\t\t\t\tadv7511_out: endpoint {\n",
"+\t\t\t\t\tremote-endpoint = <&hdmi_con>;\n",
@@ -346,4 +336,4 @@
" \t\tfunction = \"scif0\";"
]
-c426c0ae564d9cfe9422935b801ceb8ac1e9a60297c1a77e42b120793cf7c744
+8da87ac597f41913704a9b86b0aa17177b116867b6964f6e4e7bf877cbffef91
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.