All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <20150527121349.GI16165@dragon>

diff --git a/a/1.txt b/N1/1.txt
index 0b6c4a8..3271736 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -21,8 +21,8 @@ can be used
 > differences between them are extracted into 2 DTS files, and
 > the common settings are collected in a common file.
 > 
-> Signed-off-by: Heiko Schocher <hs@denx.de>
-> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
+> Signed-off-by: Heiko Schocher <hs-ynQEQJNshbs@public.gmane.org>
+> Reviewed-by: Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
 
 The subject prefix should be like 'ARM: dts: imx6: ...'
 
@@ -31,7 +31,7 @@ The subject prefix should be like 'ARM: dts: imx6: ...'
 > Changes in v5:
 > - add comments from Philipp Zabel:
 >   - fix license text
->   - add Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
+>   - add Reviewed-by: Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
 > - patch: "drm/panel: Add support for LG LB070WV8 800x480 7" panel"
 >   is applied from Tierry Reding, so removed from this patchseries
 > 
@@ -52,7 +52,7 @@ The subject prefix should be like 'ARM: dts: imx6: ...'
 >   - add DTB in Makefile
 >   - remove "status = "okay"" from backlight node
 >   - rename "pinctrl_ipu1_1_80Ohm_clk" to "pinctrl_ipu_disp"
->   - remove "status = "okay"" from "display at di0" node
+>   - remove "status = "okay"" from "display@di0" node
 >   - remove "dma-names;" in ecspix nodes
 >   - use macro for clock ID and gpio
 >   - move iomuxc to the bottom of the file
@@ -116,7 +116,7 @@ I fixed these trivial things and applied the patch.
 Shawn
 
 > + *
-> + * Copyright (C) 2015 Heiko Schocher <hs@denx.de>
+> + * Copyright (C) 2015 Heiko Schocher <hs-ynQEQJNshbs@public.gmane.org>
 > + *
 > + * This file is dual-licensed: you can use it either under the terms
 > + * of the GPL or the X11 license, at your option. Note that this dual
@@ -167,7 +167,7 @@ Shawn
 > +		reg = <0x10000000 0x40000000>;
 > +	};
 > +
-> +	display0: display at di0 {
+> +	display0: display@di0 {
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +		compatible = "fsl,imx-parallel-display";
@@ -175,14 +175,14 @@ Shawn
 > +		pinctrl-names = "default";
 > +		pinctrl-0 = <&pinctrl_ipu_disp>;
 > +
-> +		port at 0 {
+> +		port@0 {
 > +			reg = <0>;
 > +			display0_in: endpoint {
 > +				remote-endpoint = <&ipu1_di0_disp0>;
 > +			};
 > +		};
 > +
-> +		port at 1 {
+> +		port@1 {
 > +			reg = <1>;
 > +			display_out: endpoint {
 > +				remote-endpoint = <&panel_in>;
@@ -192,7 +192,7 @@ Shawn
 > +};
 > +
 > +&ecspi1 {
-> +	lcd_panel: display at 0 {
+> +	lcd_panel: display@0 {
 > +		#address-cells = <1>;
 > +		#size-cells = <1>;
 > +		compatible = "lg,lg4573";
@@ -226,7 +226,7 @@ Shawn
 > +};
 > +
 > +&i2c3 {
-> +	touch: touch at 4b {
+> +	touch: touch@4b {
 > +		compatible = "atmel,maxtouch";
 > +		reg = <0x4b>;
 > +		interrupt-parent = <&gpio2>;
@@ -281,7 +281,7 @@ Shawn
 > +/*
 > + * support fot the imx6 based aristainetos2 board
 > + *
-> + * Copyright (C) 2015 Heiko Schocher <hs@denx.de>
+> + * Copyright (C) 2015 Heiko Schocher <hs-ynQEQJNshbs@public.gmane.org>
 > + *
 > + * This file is dual-licensed: you can use it either under the terms
 > + * of the GPL or the X11 license, at your option. Note that this dual
@@ -346,7 +346,7 @@ Shawn
 > +};
 > +
 > +&i2c3 {
-> +	touch: touch at 4d {
+> +	touch: touch@4d {
 > +		compatible = "atmel,maxtouch";
 > +		reg = <0x4d>;
 > +		interrupt-parent = <&gpio2>;
@@ -357,17 +357,17 @@ Shawn
 > +&ldb {
 > +	status = "okay";
 > +
-> +	lvds-channel at 0 {
+> +	lvds-channel@0 {
 > +		status = "okay";
 > +
-> +		port at 0 {
+> +		port@0 {
 > +			reg = <0>;
 > +			lvds0_in: endpoint {
 > +				remote-endpoint = <&ipu1_di0_lvds0>;
 > +			};
 > +		};
 > +
-> +		port at 4 {
+> +		port@4 {
 > +			reg = <4>;
 > +			lvds0_out: endpoint {
 > +				remote-endpoint = <&panel_in>;
@@ -384,7 +384,7 @@ Shawn
 > +/*
 > + * support fot the imx6 based aristainetos2 board
 > + *
-> + * Copyright (C) 2015 Heiko Schocher <hs@denx.de>
+> + * Copyright (C) 2015 Heiko Schocher <hs-ynQEQJNshbs@public.gmane.org>
 > + *
 > + * This file is dual-licensed: you can use it either under the terms
 > + * of the GPL or the X11 license, at your option. Note that this dual
@@ -521,7 +521,7 @@ Shawn
 > +	pinctrl-0 = <&pinctrl_ecspi4>;
 > +	status = "okay";
 > +
-> +	flash: m25p80 at 1 {
+> +	flash: m25p80@1 {
 > +		#address-cells = <1>;
 > +		#size-cells = <1>;
 > +		compatible = "micron,n25q128a11";
@@ -535,7 +535,7 @@ Shawn
 > +	pinctrl-0 = <&pinctrl_i2c1>;
 > +	status = "okay";
 > +
-> +	pmic at 58 {
+> +	pmic@58 {
 > +		compatible = "dlg,da9063";
 > +		reg = <0x58>;
 > +		interrupt-parent = <&gpio1>;
@@ -656,7 +656,7 @@ Shawn
 > +		};
 > +	};
 > +
-> +	tmp103: tmp103 at 71 {
+> +	tmp103: tmp103@71 {
 > +		compatible = "ti,tmp103";
 > +		reg = <0x71>;
 > +	};
@@ -673,14 +673,14 @@ Shawn
 > +	pinctrl-0 = <&pinctrl_i2c3>;
 > +	status = "okay";
 > +
-> +	expander: tca6416 at 20 {
+> +	expander: tca6416@20 {
 > +		compatible = "ti,tca6416";
 > +		reg = <0x20>;
 > +		#gpio-cells = <2>;
 > +		gpio-controller;
 > +	};
 > +
-> +	rtc at 68 {
+> +	rtc@68 {
 > +		compatible = "dallas,m41t00";
 > +		reg = <0x68>;
 > +	};
@@ -691,12 +691,12 @@ Shawn
 > +	pinctrl-0 = <&pinctrl_i2c4>;
 > +	status = "okay";
 > +
-> +	eeprom at 50{
+> +	eeprom@50{
 > +		compatible = "atmel,24c64";
 > +		reg = <0x50>;
 > +	};
 > +
-> +	eeprom at 57{
+> +	eeprom@57{
 > +		compatible = "atmel,24c64";
 > +		reg = <0x57>;
 > +	};
@@ -1016,4 +1016,8 @@ Shawn
 > +};
 > -- 
 > 2.1.0
->
+> 
+--
+To unsubscribe from this list: send the line "unsubscribe devicetree" in
+the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/a/content_digest b/N1/content_digest
index cd56e2e..da882ee 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,14 @@
  "ref\01432613186-1356-1-git-send-email-hs@denx.de\0"
- "From\0shawn.guo@linaro.org (Shawn Guo)\0"
- "Subject\0[PATCH v5] arm, imx6, dts: add DT for aristainetos2 board\0"
+ "ref\01432613186-1356-1-git-send-email-hs-ynQEQJNshbs@public.gmane.org\0"
+ "From\0Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0"
+ "Subject\0Re: [PATCH v5] arm, imx6, dts: add DT for aristainetos2 board\0"
  "Date\0Wed, 27 May 2015 20:13:50 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Heiko Schocher <hs-ynQEQJNshbs@public.gmane.org>\0"
+ "Cc\0linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
+  Sascha Hauer <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
+  Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
+  linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
+ " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0"
  "\00:1\0"
  "b\0"
  "On Tue, May 26, 2015 at 06:06:26AM +0200, Heiko Schocher wrote:\n"
@@ -28,8 +34,8 @@
  "> differences between them are extracted into 2 DTS files, and\n"
  "> the common settings are collected in a common file.\n"
  "> \n"
- "> Signed-off-by: Heiko Schocher <hs@denx.de>\n"
- "> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>\n"
+ "> Signed-off-by: Heiko Schocher <hs-ynQEQJNshbs@public.gmane.org>\n"
+ "> Reviewed-by: Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n"
  "\n"
  "The subject prefix should be like 'ARM: dts: imx6: ...'\n"
  "\n"
@@ -38,7 +44,7 @@
  "> Changes in v5:\n"
  "> - add comments from Philipp Zabel:\n"
  ">   - fix license text\n"
- ">   - add Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>\n"
+ ">   - add Reviewed-by: Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n"
  "> - patch: \"drm/panel: Add support for LG LB070WV8 800x480 7\" panel\"\n"
  ">   is applied from Tierry Reding, so removed from this patchseries\n"
  "> \n"
@@ -59,7 +65,7 @@
  ">   - add DTB in Makefile\n"
  ">   - remove \"status = \"okay\"\" from backlight node\n"
  ">   - rename \"pinctrl_ipu1_1_80Ohm_clk\" to \"pinctrl_ipu_disp\"\n"
- ">   - remove \"status = \"okay\"\" from \"display at di0\" node\n"
+ ">   - remove \"status = \"okay\"\" from \"display@di0\" node\n"
  ">   - remove \"dma-names;\" in ecspix nodes\n"
  ">   - use macro for clock ID and gpio\n"
  ">   - move iomuxc to the bottom of the file\n"
@@ -123,7 +129,7 @@
  "Shawn\n"
  "\n"
  "> + *\n"
- "> + * Copyright (C) 2015 Heiko Schocher <hs@denx.de>\n"
+ "> + * Copyright (C) 2015 Heiko Schocher <hs-ynQEQJNshbs@public.gmane.org>\n"
  "> + *\n"
  "> + * This file is dual-licensed: you can use it either under the terms\n"
  "> + * of the GPL or the X11 license, at your option. Note that this dual\n"
@@ -174,7 +180,7 @@
  "> +\t\treg = <0x10000000 0x40000000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tdisplay0: display at di0 {\n"
+ "> +\tdisplay0: display@di0 {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\t\tcompatible = \"fsl,imx-parallel-display\";\n"
@@ -182,14 +188,14 @@
  "> +\t\tpinctrl-names = \"default\";\n"
  "> +\t\tpinctrl-0 = <&pinctrl_ipu_disp>;\n"
  "> +\n"
- "> +\t\tport at 0 {\n"
+ "> +\t\tport@0 {\n"
  "> +\t\t\treg = <0>;\n"
  "> +\t\t\tdisplay0_in: endpoint {\n"
  "> +\t\t\t\tremote-endpoint = <&ipu1_di0_disp0>;\n"
  "> +\t\t\t};\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tport at 1 {\n"
+ "> +\t\tport@1 {\n"
  "> +\t\t\treg = <1>;\n"
  "> +\t\t\tdisplay_out: endpoint {\n"
  "> +\t\t\t\tremote-endpoint = <&panel_in>;\n"
@@ -199,7 +205,7 @@
  "> +};\n"
  "> +\n"
  "> +&ecspi1 {\n"
- "> +\tlcd_panel: display at 0 {\n"
+ "> +\tlcd_panel: display@0 {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <1>;\n"
  "> +\t\tcompatible = \"lg,lg4573\";\n"
@@ -233,7 +239,7 @@
  "> +};\n"
  "> +\n"
  "> +&i2c3 {\n"
- "> +\ttouch: touch at 4b {\n"
+ "> +\ttouch: touch@4b {\n"
  "> +\t\tcompatible = \"atmel,maxtouch\";\n"
  "> +\t\treg = <0x4b>;\n"
  "> +\t\tinterrupt-parent = <&gpio2>;\n"
@@ -288,7 +294,7 @@
  "> +/*\n"
  "> + * support fot the imx6 based aristainetos2 board\n"
  "> + *\n"
- "> + * Copyright (C) 2015 Heiko Schocher <hs@denx.de>\n"
+ "> + * Copyright (C) 2015 Heiko Schocher <hs-ynQEQJNshbs@public.gmane.org>\n"
  "> + *\n"
  "> + * This file is dual-licensed: you can use it either under the terms\n"
  "> + * of the GPL or the X11 license, at your option. Note that this dual\n"
@@ -353,7 +359,7 @@
  "> +};\n"
  "> +\n"
  "> +&i2c3 {\n"
- "> +\ttouch: touch at 4d {\n"
+ "> +\ttouch: touch@4d {\n"
  "> +\t\tcompatible = \"atmel,maxtouch\";\n"
  "> +\t\treg = <0x4d>;\n"
  "> +\t\tinterrupt-parent = <&gpio2>;\n"
@@ -364,17 +370,17 @@
  "> +&ldb {\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\tlvds-channel at 0 {\n"
+ "> +\tlvds-channel@0 {\n"
  "> +\t\tstatus = \"okay\";\n"
  "> +\n"
- "> +\t\tport at 0 {\n"
+ "> +\t\tport@0 {\n"
  "> +\t\t\treg = <0>;\n"
  "> +\t\t\tlvds0_in: endpoint {\n"
  "> +\t\t\t\tremote-endpoint = <&ipu1_di0_lvds0>;\n"
  "> +\t\t\t};\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tport at 4 {\n"
+ "> +\t\tport@4 {\n"
  "> +\t\t\treg = <4>;\n"
  "> +\t\t\tlvds0_out: endpoint {\n"
  "> +\t\t\t\tremote-endpoint = <&panel_in>;\n"
@@ -391,7 +397,7 @@
  "> +/*\n"
  "> + * support fot the imx6 based aristainetos2 board\n"
  "> + *\n"
- "> + * Copyright (C) 2015 Heiko Schocher <hs@denx.de>\n"
+ "> + * Copyright (C) 2015 Heiko Schocher <hs-ynQEQJNshbs@public.gmane.org>\n"
  "> + *\n"
  "> + * This file is dual-licensed: you can use it either under the terms\n"
  "> + * of the GPL or the X11 license, at your option. Note that this dual\n"
@@ -528,7 +534,7 @@
  "> +\tpinctrl-0 = <&pinctrl_ecspi4>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\tflash: m25p80 at 1 {\n"
+ "> +\tflash: m25p80@1 {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <1>;\n"
  "> +\t\tcompatible = \"micron,n25q128a11\";\n"
@@ -542,7 +548,7 @@
  "> +\tpinctrl-0 = <&pinctrl_i2c1>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\tpmic at 58 {\n"
+ "> +\tpmic@58 {\n"
  "> +\t\tcompatible = \"dlg,da9063\";\n"
  "> +\t\treg = <0x58>;\n"
  "> +\t\tinterrupt-parent = <&gpio1>;\n"
@@ -663,7 +669,7 @@
  "> +\t\t};\n"
  "> +\t};\n"
  "> +\n"
- "> +\ttmp103: tmp103 at 71 {\n"
+ "> +\ttmp103: tmp103@71 {\n"
  "> +\t\tcompatible = \"ti,tmp103\";\n"
  "> +\t\treg = <0x71>;\n"
  "> +\t};\n"
@@ -680,14 +686,14 @@
  "> +\tpinctrl-0 = <&pinctrl_i2c3>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\texpander: tca6416 at 20 {\n"
+ "> +\texpander: tca6416@20 {\n"
  "> +\t\tcompatible = \"ti,tca6416\";\n"
  "> +\t\treg = <0x20>;\n"
  "> +\t\t#gpio-cells = <2>;\n"
  "> +\t\tgpio-controller;\n"
  "> +\t};\n"
  "> +\n"
- "> +\trtc at 68 {\n"
+ "> +\trtc@68 {\n"
  "> +\t\tcompatible = \"dallas,m41t00\";\n"
  "> +\t\treg = <0x68>;\n"
  "> +\t};\n"
@@ -698,12 +704,12 @@
  "> +\tpinctrl-0 = <&pinctrl_i2c4>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\teeprom at 50{\n"
+ "> +\teeprom@50{\n"
  "> +\t\tcompatible = \"atmel,24c64\";\n"
  "> +\t\treg = <0x50>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\teeprom at 57{\n"
+ "> +\teeprom@57{\n"
  "> +\t\tcompatible = \"atmel,24c64\";\n"
  "> +\t\treg = <0x57>;\n"
  "> +\t};\n"
@@ -1023,6 +1029,10 @@
  "> +};\n"
  "> -- \n"
  "> 2.1.0\n"
- >
+ "> \n"
+ "--\n"
+ "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n"
+ "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n"
+ More majordomo info at  http://vger.kernel.org/majordomo-info.html
 
-dc83fc9a64a37c63c703d9836d90877725db4c0da2c6f539039bbc3d3b7e9354
+cce7cf3e6624ca4876667d470089dc8a146daf5cfd1ec3a59d3f0d9bffd09f14

diff --git a/a/1.txt b/N2/1.txt
index 0b6c4a8..b863f68 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -52,7 +52,7 @@ The subject prefix should be like 'ARM: dts: imx6: ...'
 >   - add DTB in Makefile
 >   - remove "status = "okay"" from backlight node
 >   - rename "pinctrl_ipu1_1_80Ohm_clk" to "pinctrl_ipu_disp"
->   - remove "status = "okay"" from "display at di0" node
+>   - remove "status = "okay"" from "display@di0" node
 >   - remove "dma-names;" in ecspix nodes
 >   - use macro for clock ID and gpio
 >   - move iomuxc to the bottom of the file
@@ -167,7 +167,7 @@ Shawn
 > +		reg = <0x10000000 0x40000000>;
 > +	};
 > +
-> +	display0: display at di0 {
+> +	display0: display@di0 {
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +		compatible = "fsl,imx-parallel-display";
@@ -175,14 +175,14 @@ Shawn
 > +		pinctrl-names = "default";
 > +		pinctrl-0 = <&pinctrl_ipu_disp>;
 > +
-> +		port at 0 {
+> +		port@0 {
 > +			reg = <0>;
 > +			display0_in: endpoint {
 > +				remote-endpoint = <&ipu1_di0_disp0>;
 > +			};
 > +		};
 > +
-> +		port at 1 {
+> +		port@1 {
 > +			reg = <1>;
 > +			display_out: endpoint {
 > +				remote-endpoint = <&panel_in>;
@@ -192,7 +192,7 @@ Shawn
 > +};
 > +
 > +&ecspi1 {
-> +	lcd_panel: display at 0 {
+> +	lcd_panel: display@0 {
 > +		#address-cells = <1>;
 > +		#size-cells = <1>;
 > +		compatible = "lg,lg4573";
@@ -226,7 +226,7 @@ Shawn
 > +};
 > +
 > +&i2c3 {
-> +	touch: touch at 4b {
+> +	touch: touch@4b {
 > +		compatible = "atmel,maxtouch";
 > +		reg = <0x4b>;
 > +		interrupt-parent = <&gpio2>;
@@ -346,7 +346,7 @@ Shawn
 > +};
 > +
 > +&i2c3 {
-> +	touch: touch at 4d {
+> +	touch: touch@4d {
 > +		compatible = "atmel,maxtouch";
 > +		reg = <0x4d>;
 > +		interrupt-parent = <&gpio2>;
@@ -357,17 +357,17 @@ Shawn
 > +&ldb {
 > +	status = "okay";
 > +
-> +	lvds-channel at 0 {
+> +	lvds-channel@0 {
 > +		status = "okay";
 > +
-> +		port at 0 {
+> +		port@0 {
 > +			reg = <0>;
 > +			lvds0_in: endpoint {
 > +				remote-endpoint = <&ipu1_di0_lvds0>;
 > +			};
 > +		};
 > +
-> +		port at 4 {
+> +		port@4 {
 > +			reg = <4>;
 > +			lvds0_out: endpoint {
 > +				remote-endpoint = <&panel_in>;
@@ -521,7 +521,7 @@ Shawn
 > +	pinctrl-0 = <&pinctrl_ecspi4>;
 > +	status = "okay";
 > +
-> +	flash: m25p80 at 1 {
+> +	flash: m25p80@1 {
 > +		#address-cells = <1>;
 > +		#size-cells = <1>;
 > +		compatible = "micron,n25q128a11";
@@ -535,7 +535,7 @@ Shawn
 > +	pinctrl-0 = <&pinctrl_i2c1>;
 > +	status = "okay";
 > +
-> +	pmic at 58 {
+> +	pmic@58 {
 > +		compatible = "dlg,da9063";
 > +		reg = <0x58>;
 > +		interrupt-parent = <&gpio1>;
@@ -656,7 +656,7 @@ Shawn
 > +		};
 > +	};
 > +
-> +	tmp103: tmp103 at 71 {
+> +	tmp103: tmp103@71 {
 > +		compatible = "ti,tmp103";
 > +		reg = <0x71>;
 > +	};
@@ -673,14 +673,14 @@ Shawn
 > +	pinctrl-0 = <&pinctrl_i2c3>;
 > +	status = "okay";
 > +
-> +	expander: tca6416 at 20 {
+> +	expander: tca6416@20 {
 > +		compatible = "ti,tca6416";
 > +		reg = <0x20>;
 > +		#gpio-cells = <2>;
 > +		gpio-controller;
 > +	};
 > +
-> +	rtc at 68 {
+> +	rtc@68 {
 > +		compatible = "dallas,m41t00";
 > +		reg = <0x68>;
 > +	};
@@ -691,12 +691,12 @@ Shawn
 > +	pinctrl-0 = <&pinctrl_i2c4>;
 > +	status = "okay";
 > +
-> +	eeprom at 50{
+> +	eeprom@50{
 > +		compatible = "atmel,24c64";
 > +		reg = <0x50>;
 > +	};
 > +
-> +	eeprom at 57{
+> +	eeprom@57{
 > +		compatible = "atmel,24c64";
 > +		reg = <0x57>;
 > +	};
diff --git a/a/content_digest b/N2/content_digest
index cd56e2e..16880a4 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -1,8 +1,13 @@
  "ref\01432613186-1356-1-git-send-email-hs@denx.de\0"
- "From\0shawn.guo@linaro.org (Shawn Guo)\0"
- "Subject\0[PATCH v5] arm, imx6, dts: add DT for aristainetos2 board\0"
+ "From\0Shawn Guo <shawn.guo@linaro.org>\0"
+ "Subject\0Re: [PATCH v5] arm, imx6, dts: add DT for aristainetos2 board\0"
  "Date\0Wed, 27 May 2015 20:13:50 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Heiko Schocher <hs@denx.de>\0"
+ "Cc\0linux-kernel@vger.kernel.org"
+  Sascha Hauer <kernel@pengutronix.de>
+  Philipp Zabel <p.zabel@pengutronix.de>
+  linux-arm-kernel@lists.infradead.org
+ " devicetree@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "On Tue, May 26, 2015 at 06:06:26AM +0200, Heiko Schocher wrote:\n"
@@ -59,7 +64,7 @@
  ">   - add DTB in Makefile\n"
  ">   - remove \"status = \"okay\"\" from backlight node\n"
  ">   - rename \"pinctrl_ipu1_1_80Ohm_clk\" to \"pinctrl_ipu_disp\"\n"
- ">   - remove \"status = \"okay\"\" from \"display at di0\" node\n"
+ ">   - remove \"status = \"okay\"\" from \"display@di0\" node\n"
  ">   - remove \"dma-names;\" in ecspix nodes\n"
  ">   - use macro for clock ID and gpio\n"
  ">   - move iomuxc to the bottom of the file\n"
@@ -174,7 +179,7 @@
  "> +\t\treg = <0x10000000 0x40000000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tdisplay0: display at di0 {\n"
+ "> +\tdisplay0: display@di0 {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\t\tcompatible = \"fsl,imx-parallel-display\";\n"
@@ -182,14 +187,14 @@
  "> +\t\tpinctrl-names = \"default\";\n"
  "> +\t\tpinctrl-0 = <&pinctrl_ipu_disp>;\n"
  "> +\n"
- "> +\t\tport at 0 {\n"
+ "> +\t\tport@0 {\n"
  "> +\t\t\treg = <0>;\n"
  "> +\t\t\tdisplay0_in: endpoint {\n"
  "> +\t\t\t\tremote-endpoint = <&ipu1_di0_disp0>;\n"
  "> +\t\t\t};\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tport at 1 {\n"
+ "> +\t\tport@1 {\n"
  "> +\t\t\treg = <1>;\n"
  "> +\t\t\tdisplay_out: endpoint {\n"
  "> +\t\t\t\tremote-endpoint = <&panel_in>;\n"
@@ -199,7 +204,7 @@
  "> +};\n"
  "> +\n"
  "> +&ecspi1 {\n"
- "> +\tlcd_panel: display at 0 {\n"
+ "> +\tlcd_panel: display@0 {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <1>;\n"
  "> +\t\tcompatible = \"lg,lg4573\";\n"
@@ -233,7 +238,7 @@
  "> +};\n"
  "> +\n"
  "> +&i2c3 {\n"
- "> +\ttouch: touch at 4b {\n"
+ "> +\ttouch: touch@4b {\n"
  "> +\t\tcompatible = \"atmel,maxtouch\";\n"
  "> +\t\treg = <0x4b>;\n"
  "> +\t\tinterrupt-parent = <&gpio2>;\n"
@@ -353,7 +358,7 @@
  "> +};\n"
  "> +\n"
  "> +&i2c3 {\n"
- "> +\ttouch: touch at 4d {\n"
+ "> +\ttouch: touch@4d {\n"
  "> +\t\tcompatible = \"atmel,maxtouch\";\n"
  "> +\t\treg = <0x4d>;\n"
  "> +\t\tinterrupt-parent = <&gpio2>;\n"
@@ -364,17 +369,17 @@
  "> +&ldb {\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\tlvds-channel at 0 {\n"
+ "> +\tlvds-channel@0 {\n"
  "> +\t\tstatus = \"okay\";\n"
  "> +\n"
- "> +\t\tport at 0 {\n"
+ "> +\t\tport@0 {\n"
  "> +\t\t\treg = <0>;\n"
  "> +\t\t\tlvds0_in: endpoint {\n"
  "> +\t\t\t\tremote-endpoint = <&ipu1_di0_lvds0>;\n"
  "> +\t\t\t};\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tport at 4 {\n"
+ "> +\t\tport@4 {\n"
  "> +\t\t\treg = <4>;\n"
  "> +\t\t\tlvds0_out: endpoint {\n"
  "> +\t\t\t\tremote-endpoint = <&panel_in>;\n"
@@ -528,7 +533,7 @@
  "> +\tpinctrl-0 = <&pinctrl_ecspi4>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\tflash: m25p80 at 1 {\n"
+ "> +\tflash: m25p80@1 {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <1>;\n"
  "> +\t\tcompatible = \"micron,n25q128a11\";\n"
@@ -542,7 +547,7 @@
  "> +\tpinctrl-0 = <&pinctrl_i2c1>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\tpmic at 58 {\n"
+ "> +\tpmic@58 {\n"
  "> +\t\tcompatible = \"dlg,da9063\";\n"
  "> +\t\treg = <0x58>;\n"
  "> +\t\tinterrupt-parent = <&gpio1>;\n"
@@ -663,7 +668,7 @@
  "> +\t\t};\n"
  "> +\t};\n"
  "> +\n"
- "> +\ttmp103: tmp103 at 71 {\n"
+ "> +\ttmp103: tmp103@71 {\n"
  "> +\t\tcompatible = \"ti,tmp103\";\n"
  "> +\t\treg = <0x71>;\n"
  "> +\t};\n"
@@ -680,14 +685,14 @@
  "> +\tpinctrl-0 = <&pinctrl_i2c3>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\texpander: tca6416 at 20 {\n"
+ "> +\texpander: tca6416@20 {\n"
  "> +\t\tcompatible = \"ti,tca6416\";\n"
  "> +\t\treg = <0x20>;\n"
  "> +\t\t#gpio-cells = <2>;\n"
  "> +\t\tgpio-controller;\n"
  "> +\t};\n"
  "> +\n"
- "> +\trtc at 68 {\n"
+ "> +\trtc@68 {\n"
  "> +\t\tcompatible = \"dallas,m41t00\";\n"
  "> +\t\treg = <0x68>;\n"
  "> +\t};\n"
@@ -698,12 +703,12 @@
  "> +\tpinctrl-0 = <&pinctrl_i2c4>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\teeprom at 50{\n"
+ "> +\teeprom@50{\n"
  "> +\t\tcompatible = \"atmel,24c64\";\n"
  "> +\t\treg = <0x50>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\teeprom at 57{\n"
+ "> +\teeprom@57{\n"
  "> +\t\tcompatible = \"atmel,24c64\";\n"
  "> +\t\treg = <0x57>;\n"
  "> +\t};\n"
@@ -1025,4 +1030,4 @@
  "> 2.1.0\n"
  >
 
-dc83fc9a64a37c63c703d9836d90877725db4c0da2c6f539039bbc3d3b7e9354
+4d4c828048bdde4516c1550742052ad6a1bc7f6d475d4a891d05875e31a49950

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.