diff for duplicates of <20180423084454.GZ25429@dragon>

diff --git a/a/1.txt b/N1/1.txt
index 2e853ee..534e265 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,4 +1,4 @@
-On Fri, Apr 20, 2018 at 02:50:52PM +0200, jan.tuerk at emtrion.com wrote:
+On Fri, Apr 20, 2018 at 02:50:52PM +0200, jan.tuerk@emtrion.com wrote:
 > From: Jan Tuerk <jan.tuerk@emtrion.com>
 > 
 > This patch adds support for the emtrion GmbH emCON-MX6 modules.
@@ -133,7 +133,7 @@ fixed regulator nodes directly under root with a unique name like below.
 	};
 
 > +
-> +		wallplug5p0: supply at 0 {
+> +		wallplug5p0: supply@0 {
 > +			compatible = "regulator-fixed";
 > +			reg = <0>;
 > +			regulator-name = "WALL-PLUG";
@@ -143,7 +143,7 @@ fixed regulator nodes directly under root with a unique name like below.
 > +			regulator-boot-on;
 > +		};
 > +
-> +		base3p3: supply at 1 {
+> +		base3p3: supply@1 {
 > +			compatible = "regulator-fixed";
 > +			reg = <1>;
 > +			vin-supply = <&wallplug5p0>;
@@ -154,7 +154,7 @@ fixed regulator nodes directly under root with a unique name like below.
 > +			regulator-boot-on;
 > +		};
 > +
-> +		base1p5: supply at 2 {
+> +		base1p5: supply@2 {
 > +			compatible = "regulator-fixed";
 > +			reg = <2>;
 > +			vin-supply = <&base3p3>;
@@ -165,7 +165,7 @@ fixed regulator nodes directly under root with a unique name like below.
 > +			regulator-boot-on;
 > +		};
 > +
-> +		reg_usb_otg: otgvbus at 3 {
+> +		reg_usb_otg: otgvbus@3 {
 > +			compatible = "regulator-fixed";
 > +			reg = <3>;
 > +			vin-supply = <&wallplug5p0>;
@@ -245,7 +245,7 @@ nodes alphabetically.
 > +	pinctrl-0 = <&pinctrl_i2c3>;
 > +	status = "okay";
 > +
-> +	sgtl5000: audio-codec at a {
+> +	sgtl5000: audio-codec@a {
 > +		compatible = "fsl,sgtl5000";
 > +		reg = <0x0a>;
 > +		clocks = <&sndosc>;
@@ -256,7 +256,7 @@ nodes alphabetically.
 
 > +	};
 > +
-> +	boardID: pca8754a at 3a {
+> +	boardID: pca8754a@3a {
 
 Please find a more generic node name for it.
 
@@ -266,7 +266,7 @@ Please find a more generic node name for it.
 > +		#gpio-cells = <1>;
 > +	};
 > +
-> +	captouch: touchscreen at 38 {
+> +	captouch: touchscreen@38 {
 > +		compatible = "edt,edt-ft5406";
 > +		reg = <0x38>;
 > +		pinctrl-names = "default";
@@ -425,7 +425,7 @@ imx6q-emcon-avari.dts.  Can you do something to avoid that?
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +
-> +		wallplug5p0: supply at 0 {
+> +		wallplug5p0: supply@0 {
 > +			compatible = "regulator-fixed";
 > +			reg = <0>;
 > +			regulator-name = "WALL-PLUG";
@@ -435,7 +435,7 @@ imx6q-emcon-avari.dts.  Can you do something to avoid that?
 > +			regulator-boot-on;
 > +		};
 > +
-> +		base3p3: supply at 1 {
+> +		base3p3: supply@1 {
 > +			compatible = "regulator-fixed";
 > +			reg = <1>;
 > +			vin-supply = <&wallplug5p0>;
@@ -446,7 +446,7 @@ imx6q-emcon-avari.dts.  Can you do something to avoid that?
 > +			regulator-boot-on;
 > +		};
 > +
-> +		base1p5: supply at 2 {
+> +		base1p5: supply@2 {
 > +			compatible = "regulator-fixed";
 > +			reg = <2>;
 > +			vin-supply = <&base3p3>;
@@ -457,7 +457,7 @@ imx6q-emcon-avari.dts.  Can you do something to avoid that?
 > +			regulator-boot-on;
 > +		};
 > +
-> +		reg_usb_otg: otgvbus at 3 {
+> +		reg_usb_otg: otgvbus@3 {
 > +			compatible = "regulator-fixed";
 > +			reg = <3>;
 > +			vin-supply = <&wallplug5p0>;
@@ -521,7 +521,7 @@ imx6q-emcon-avari.dts.  Can you do something to avoid that?
 > +	pinctrl-0 = <&pinctrl_i2c3>;
 > +	status = "okay";
 > +
-> +	sgtl5000: audio-codec at a {
+> +	sgtl5000: audio-codec@a {
 > +		compatible = "fsl,sgtl5000";
 > +		reg = <0x0a>;
 > +		clocks = <&sndosc>;
@@ -529,14 +529,14 @@ imx6q-emcon-avari.dts.  Can you do something to avoid that?
 > +		VDDIO-supply = <&base3p3>;
 > +	};
 > +
-> +	boardID: pca8754a at 3a {
+> +	boardID: pca8754a@3a {
 > +		compatible = "nxp,pca8574";
 > +		reg = <0x3a>;
 > +		gpio-controller;
 > +		#gpio-cells = <1>;
 > +	};
 > +
-> +	captouch: touchscreen at 38 {
+> +	captouch: touchscreen@38 {
 > +		compatible = "edt,edt-ft5406";
 > +		reg = <0x38>;
 > +		pinctrl-names = "default";
@@ -679,7 +679,7 @@ imx6q-emcon-avari.dts.  Can you do something to avoid that?
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +
-> +		reg_parallel_disp: regulator at 0 {
+> +		reg_parallel_disp: regulator@0 {
 > +			compatible = "regulator-fixed";
 > +			reg = <0>;
 > +			pinctrl-names = "default";
@@ -691,7 +691,7 @@ imx6q-emcon-avari.dts.  Can you do something to avoid that?
 > +			enable-active-high;
 > +		};
 > +
-> +		reg_lvds_disp: regulator at 1 {
+> +		reg_lvds_disp: regulator@1 {
 > +			compatible = "regulator-fixed";
 > +			reg = <1>;
 > +			regulator-name = "LVDS-Supply";
@@ -756,7 +756,7 @@ s/disp0/display
 > +		pinctrl-0 = <&pinctrl_rgb24_display>;
 > +		status = "disabled";
 > +
-> +		port at 0 {
+> +		port@0 {
 > +			reg = <0>;
 
 Have a newline between property list and child node.
@@ -766,7 +766,7 @@ Have a newline between property list and child node.
 > +			};
 > +		};
 > +
-> +		port at 1 {
+> +		port@1 {
 > +			reg = <1>;
 > +			rgb_encoder_out: endpoint {
 > +				remote-endpoint = <&rgb_panel_in>;
@@ -1224,12 +1224,12 @@ Try to keep these pinctrl entries alphabetically sorted.
 > +	pinctrl-0 = <&pinctrl_i2c1>;
 > +	status = "okay";
 > +
-> +	rtc: rtc at 68 {
+> +	rtc: rtc@68 {
 > +		compatible = "dallas,ds1307";
 > +		reg = <0x68>;
 > +	};
 > +
-> +	da9063: pmic at 58 {
+> +	da9063: pmic@58 {
 > +		compatible = "dlg,da9063";
 > +		reg = <0x58>;
 > +		pinctrl-names = "default";
@@ -1374,7 +1374,7 @@ s/wdt/watchdog
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +
-> +		ksz9031: phy at 0 {
+> +		ksz9031: phy@0 {
 > +			compatible = "ethernet-phy-ieee802.3-c22";
 > +			reg = <0>;
 > +			interrupt-parent = <&gpio1>;
@@ -1517,4 +1517,8 @@ Shawn
 > +};
 > -- 
 > 2.11.0
->
+> 
+_______________________________________________
+dri-devel mailing list
+dri-devel@lists.freedesktop.org
+https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index 1880b23..fdde959 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,13 +1,24 @@
  "ref\020171220134710.64479-2-jan.tuerk@emtrion.com\0"
  "ref\020180420125108.14197-1-jan.tuerk@emtrion.com\0"
  "ref\020180420125108.14197-6-jan.tuerk@emtrion.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH v3 5/6] ARM: dts: Add support for emtrion emCON-MX6 series\0"
+ "From\0Shawn Guo <shawnguo@kernel.org>\0"
+ "Subject\0Re: [PATCH v3 5/6] ARM: dts: Add support for emtrion emCON-MX6 series\0"
  "Date\0Mon, 23 Apr 2018 16:44:56 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0jan.tuerk@emtrion.com\0"
+ "Cc\0Mark Rutland <mark.rutland@arm.com>"
+  devicetree@vger.kernel.org
+  David Airlie <airlied@linux.ie>
+  Russell King <linux@armlinux.org.uk>
+  dri-devel@lists.freedesktop.org
+  linux-kernel@vger.kernel.org
+  Rob Herring <robh+dt@kernel.org>
+  Thierry Reding <thierry.reding@gmail.com>
+  Sascha Hauer <kernel@pengutronix.de>
+  Fabio Estevam <fabio.estevam@nxp.com>
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
- "On Fri, Apr 20, 2018 at 02:50:52PM +0200, jan.tuerk at emtrion.com wrote:\n"
+ "On Fri, Apr 20, 2018 at 02:50:52PM +0200, jan.tuerk@emtrion.com wrote:\n"
  "> From: Jan Tuerk <jan.tuerk@emtrion.com>\n"
  "> \n"
  "> This patch adds support for the emtrion GmbH emCON-MX6 modules.\n"
@@ -142,7 +153,7 @@
  "\t};\n"
  "\n"
  "> +\n"
- "> +\t\twallplug5p0: supply at 0 {\n"
+ "> +\t\twallplug5p0: supply@0 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <0>;\n"
  "> +\t\t\tregulator-name = \"WALL-PLUG\";\n"
@@ -152,7 +163,7 @@
  "> +\t\t\tregulator-boot-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tbase3p3: supply at 1 {\n"
+ "> +\t\tbase3p3: supply@1 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <1>;\n"
  "> +\t\t\tvin-supply = <&wallplug5p0>;\n"
@@ -163,7 +174,7 @@
  "> +\t\t\tregulator-boot-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tbase1p5: supply at 2 {\n"
+ "> +\t\tbase1p5: supply@2 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <2>;\n"
  "> +\t\t\tvin-supply = <&base3p3>;\n"
@@ -174,7 +185,7 @@
  "> +\t\t\tregulator-boot-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\treg_usb_otg: otgvbus at 3 {\n"
+ "> +\t\treg_usb_otg: otgvbus@3 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <3>;\n"
  "> +\t\t\tvin-supply = <&wallplug5p0>;\n"
@@ -254,7 +265,7 @@
  "> +\tpinctrl-0 = <&pinctrl_i2c3>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\tsgtl5000: audio-codec at a {\n"
+ "> +\tsgtl5000: audio-codec@a {\n"
  "> +\t\tcompatible = \"fsl,sgtl5000\";\n"
  "> +\t\treg = <0x0a>;\n"
  "> +\t\tclocks = <&sndosc>;\n"
@@ -265,7 +276,7 @@
  "\n"
  "> +\t};\n"
  "> +\n"
- "> +\tboardID: pca8754a at 3a {\n"
+ "> +\tboardID: pca8754a@3a {\n"
  "\n"
  "Please find a more generic node name for it.\n"
  "\n"
@@ -275,7 +286,7 @@
  "> +\t\t#gpio-cells = <1>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tcaptouch: touchscreen at 38 {\n"
+ "> +\tcaptouch: touchscreen@38 {\n"
  "> +\t\tcompatible = \"edt,edt-ft5406\";\n"
  "> +\t\treg = <0x38>;\n"
  "> +\t\tpinctrl-names = \"default\";\n"
@@ -434,7 +445,7 @@
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\n"
- "> +\t\twallplug5p0: supply at 0 {\n"
+ "> +\t\twallplug5p0: supply@0 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <0>;\n"
  "> +\t\t\tregulator-name = \"WALL-PLUG\";\n"
@@ -444,7 +455,7 @@
  "> +\t\t\tregulator-boot-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tbase3p3: supply at 1 {\n"
+ "> +\t\tbase3p3: supply@1 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <1>;\n"
  "> +\t\t\tvin-supply = <&wallplug5p0>;\n"
@@ -455,7 +466,7 @@
  "> +\t\t\tregulator-boot-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tbase1p5: supply at 2 {\n"
+ "> +\t\tbase1p5: supply@2 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <2>;\n"
  "> +\t\t\tvin-supply = <&base3p3>;\n"
@@ -466,7 +477,7 @@
  "> +\t\t\tregulator-boot-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\treg_usb_otg: otgvbus at 3 {\n"
+ "> +\t\treg_usb_otg: otgvbus@3 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <3>;\n"
  "> +\t\t\tvin-supply = <&wallplug5p0>;\n"
@@ -530,7 +541,7 @@
  "> +\tpinctrl-0 = <&pinctrl_i2c3>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\tsgtl5000: audio-codec at a {\n"
+ "> +\tsgtl5000: audio-codec@a {\n"
  "> +\t\tcompatible = \"fsl,sgtl5000\";\n"
  "> +\t\treg = <0x0a>;\n"
  "> +\t\tclocks = <&sndosc>;\n"
@@ -538,14 +549,14 @@
  "> +\t\tVDDIO-supply = <&base3p3>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tboardID: pca8754a at 3a {\n"
+ "> +\tboardID: pca8754a@3a {\n"
  "> +\t\tcompatible = \"nxp,pca8574\";\n"
  "> +\t\treg = <0x3a>;\n"
  "> +\t\tgpio-controller;\n"
  "> +\t\t#gpio-cells = <1>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tcaptouch: touchscreen at 38 {\n"
+ "> +\tcaptouch: touchscreen@38 {\n"
  "> +\t\tcompatible = \"edt,edt-ft5406\";\n"
  "> +\t\treg = <0x38>;\n"
  "> +\t\tpinctrl-names = \"default\";\n"
@@ -688,7 +699,7 @@
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\n"
- "> +\t\treg_parallel_disp: regulator at 0 {\n"
+ "> +\t\treg_parallel_disp: regulator@0 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <0>;\n"
  "> +\t\t\tpinctrl-names = \"default\";\n"
@@ -700,7 +711,7 @@
  "> +\t\t\tenable-active-high;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\treg_lvds_disp: regulator at 1 {\n"
+ "> +\t\treg_lvds_disp: regulator@1 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <1>;\n"
  "> +\t\t\tregulator-name = \"LVDS-Supply\";\n"
@@ -765,7 +776,7 @@
  "> +\t\tpinctrl-0 = <&pinctrl_rgb24_display>;\n"
  "> +\t\tstatus = \"disabled\";\n"
  "> +\n"
- "> +\t\tport at 0 {\n"
+ "> +\t\tport@0 {\n"
  "> +\t\t\treg = <0>;\n"
  "\n"
  "Have a newline between property list and child node.\n"
@@ -775,7 +786,7 @@
  "> +\t\t\t};\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tport at 1 {\n"
+ "> +\t\tport@1 {\n"
  "> +\t\t\treg = <1>;\n"
  "> +\t\t\trgb_encoder_out: endpoint {\n"
  "> +\t\t\t\tremote-endpoint = <&rgb_panel_in>;\n"
@@ -1233,12 +1244,12 @@
  "> +\tpinctrl-0 = <&pinctrl_i2c1>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\trtc: rtc at 68 {\n"
+ "> +\trtc: rtc@68 {\n"
  "> +\t\tcompatible = \"dallas,ds1307\";\n"
  "> +\t\treg = <0x68>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tda9063: pmic at 58 {\n"
+ "> +\tda9063: pmic@58 {\n"
  "> +\t\tcompatible = \"dlg,da9063\";\n"
  "> +\t\treg = <0x58>;\n"
  "> +\t\tpinctrl-names = \"default\";\n"
@@ -1383,7 +1394,7 @@
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\n"
- "> +\t\tksz9031: phy at 0 {\n"
+ "> +\t\tksz9031: phy@0 {\n"
  "> +\t\t\tcompatible = \"ethernet-phy-ieee802.3-c22\";\n"
  "> +\t\t\treg = <0>;\n"
  "> +\t\t\tinterrupt-parent = <&gpio1>;\n"
@@ -1526,6 +1537,10 @@
  "> +};\n"
  "> -- \n"
  "> 2.11.0\n"
- >
+ "> \n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ https://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-83eaa065f9a8fce1fb7875bb5214ae90219aaf1c753d1e245a7951f460c677ac
+366b2b3876fa9e44e1d125db974a667bb9bd8c6b329330df8c2a81692551353e
