diff for duplicates of <20150518113135.GD1071@dragon> diff --git a/a/1.txt b/N1/1.txt index a8aa717..4e91bcf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,7 +18,7 @@ What are the differences between aristainetos2 and aristainetos board? > 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> +> Signed-off-by: Heiko Schocher <hs-ynQEQJNshbs@public.gmane.org> > --- > > Changes in v2: @@ -48,7 +48,7 @@ Add them as DTB target into arch/arm/boot/dts/Makefile. > +/* > + * 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 program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as @@ -85,7 +85,7 @@ saved. > + }; > + > + soc { -> + display0: display at di0 { +> + display0: display@di0 { > + compatible = "fsl,imx-parallel-display"; > + interface-pix-fmt = "rgb24"; > + pinctrl-names = "default"; @@ -109,7 +109,7 @@ Can be saved? > +}; > + > +&ecspi1 { -> + lcd_panel: display at 0 { +> + lcd_panel: display@0 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "lg,lg4573"; @@ -136,7 +136,7 @@ Can be saved? > +}; > + > +&i2c3 { -> + atmel: atmel_mxt_ts at 4b { +> + atmel: atmel_mxt_ts@4b { Node name should be generic. @@ -206,7 +206,7 @@ suffix '_80Ohm_clk' can be saved too? > +/* > + * 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 program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as @@ -234,7 +234,7 @@ suffix '_80Ohm_clk' can be saved too? > +}; > + > +&i2c3 { -> + atmel: atmel_mxt_ts at 4d { +> + atmel: atmel_mxt_ts@4d { > + compatible = "atmel,maxtouch"; > + reg = <0x4d>; > + interrupt-parent = <&gpio2>; @@ -250,7 +250,7 @@ you put it into imx6qdl-aristainetos2.dtsi? > +&ldb { > + status = "okay"; > + -> + lvds-channel at 0 { +> + lvds-channel@0 { > + fsl,data-mapping = "spwg"; > + fsl,data-width = <24>; > + status = "okay"; @@ -280,7 +280,7 @@ you put it into imx6qdl-aristainetos2.dtsi? > +/* > + * 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 program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as @@ -385,7 +385,7 @@ The dma-names should be a property with string value. > + dma-names; > + status = "okay"; > + -> + flash: m25p80 at 1 { +> + flash: m25p80@1 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "micron,n25q128a11"; @@ -399,7 +399,7 @@ The dma-names should be a property with string value. > + pinctrl-0 = <&pinctrl_i2c1>; > + status = "okay"; > + -> + pmic at 58 { +> + pmic@58 { > + compatible = "dialog,da9063"; > + reg = <0x58>; > + interrupt-parent = <&gpio1>; @@ -522,7 +522,7 @@ The dma-names should be a property with string value. Have a new line between nodes. -> + tmp103: tmp103 at 71 { +> + tmp103: tmp103@71 { > + compatible = "ti,tmp103"; > + reg = <0x71>; > + }; @@ -539,14 +539,14 @@ Have a new line between nodes. > + 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>; > + }; @@ -560,14 +560,14 @@ Use macro for clock ID. > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2c4>; > + status = "okay"; -> + eeprom at 50{ +> + eeprom@50{ > + compatible = "atmel,24c64"; > + reg = <0x50>; > + }; Have new line between nodes. -> + eeprom at 57{ +> + eeprom@57{ > + compatible = "atmel,24c64"; > + reg = <0x57>; > + }; @@ -947,6 +947,10 @@ Shawn > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -> the body of a message to majordomo at vger.kernel.org +> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ +-- +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 e2f5ded..b75ac92 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,14 @@ "ref\01431334974-27531-1-git-send-email-hs@denx.de\0" - "From\0shawnguo@kernel.org (Shawn Guo)\0" - "Subject\0[PATCH v2] arm, imx6, dts: add DT for aristainetos2 board\0" + "ref\01431334974-27531-1-git-send-email-hs-ynQEQJNshbs@public.gmane.org\0" + "From\0Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" + "Subject\0Re: [PATCH v2] arm, imx6, dts: add DT for aristainetos2 board\0" "Date\0Mon, 18 May 2015 19:31:35 +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" + Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> + Sascha Hauer <kernel-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 Mon, May 11, 2015 at 11:02:54AM +0200, Heiko Schocher wrote:\n" @@ -25,7 +31,7 @@ "> 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" + "> Signed-off-by: Heiko Schocher <hs-ynQEQJNshbs@public.gmane.org>\n" "> ---\n" "> \n" "> Changes in v2:\n" @@ -55,7 +61,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 program is free software; you can redistribute it and/or modify\n" "> + * it under the terms of the GNU General Public License version 2 as\n" @@ -92,7 +98,7 @@ "> +\t};\n" "> +\n" "> +\tsoc {\n" - "> +\t\tdisplay0: display at di0 {\n" + "> +\t\tdisplay0: display@di0 {\n" "> +\t\t\tcompatible = \"fsl,imx-parallel-display\";\n" "> +\t\t\tinterface-pix-fmt = \"rgb24\";\n" "> +\t\t\tpinctrl-names = \"default\";\n" @@ -116,7 +122,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" @@ -143,7 +149,7 @@ "> +};\n" "> +\n" "> +&i2c3 {\n" - "> +\tatmel: atmel_mxt_ts at 4b {\n" + "> +\tatmel: atmel_mxt_ts@4b {\n" "\n" "Node name should be generic.\n" "\n" @@ -213,7 +219,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 program is free software; you can redistribute it and/or modify\n" "> + * it under the terms of the GNU General Public License version 2 as\n" @@ -241,7 +247,7 @@ "> +};\n" "> +\n" "> +&i2c3 {\n" - "> +\tatmel: atmel_mxt_ts at 4d {\n" + "> +\tatmel: atmel_mxt_ts@4d {\n" "> +\t\tcompatible = \"atmel,maxtouch\";\n" "> +\t\treg = <0x4d>;\n" "> +\t\tinterrupt-parent = <&gpio2>;\n" @@ -257,7 +263,7 @@ "> +&ldb {\n" "> +\tstatus = \"okay\";\n" "> +\n" - "> +\tlvds-channel at 0 {\n" + "> +\tlvds-channel@0 {\n" "> +\t\tfsl,data-mapping = \"spwg\";\n" "> +\t\tfsl,data-width = <24>;\n" "> +\t\tstatus = \"okay\";\n" @@ -287,7 +293,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 program is free software; you can redistribute it and/or modify\n" "> + * it under the terms of the GNU General Public License version 2 as\n" @@ -392,7 +398,7 @@ "> +\tdma-names;\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" @@ -406,7 +412,7 @@ "> +\tpinctrl-0 = <&pinctrl_i2c1>;\n" "> +\tstatus = \"okay\";\n" "> +\n" - "> +\tpmic at 58 {\n" + "> +\tpmic@58 {\n" "> +\t\tcompatible = \"dialog,da9063\";\n" "> +\t\treg = <0x58>;\n" "> +\t\tinterrupt-parent = <&gpio1>;\n" @@ -529,7 +535,7 @@ "\n" "Have a new line between nodes.\n" "\n" - "> +\ttmp103: tmp103 at 71 {\n" + "> +\ttmp103: tmp103@71 {\n" "> +\t\tcompatible = \"ti,tmp103\";\n" "> +\t\treg = <0x71>;\n" "> +\t};\n" @@ -546,14 +552,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" @@ -567,14 +573,14 @@ "> +\tpinctrl-names = \"default\";\n" "> +\tpinctrl-0 = <&pinctrl_i2c4>;\n" "> +\tstatus = \"okay\";\n" - "> +\teeprom at 50{\n" + "> +\teeprom@50{\n" "> +\t\tcompatible = \"atmel,24c64\";\n" "> +\t\treg = <0x50>;\n" "> +\t};\n" "\n" "Have new line between nodes.\n" "\n" - "> +\teeprom at 57{\n" + "> +\teeprom@57{\n" "> +\t\tcompatible = \"atmel,24c64\";\n" "> +\t\treg = <0x57>;\n" "> +\t};\n" @@ -954,8 +960,12 @@ "> \n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe linux-kernel\" in\n" - "> the body of a message to majordomo at vger.kernel.org\n" + "> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" - > Please read the FAQ at http://www.tux.org/lkml/ + "> Please read the FAQ at http://www.tux.org/lkml/\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 -3bdef13a4d4c931637e51fbdf8aaf4fed944e1dd361d1dd2cfa7760fd2abdb04 +3525cfdca59250c51fd30f9300ac235fc5ddbc43cd36017e65490b92a6506c72
diff --git a/a/1.txt b/N2/1.txt index a8aa717..de06967 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -85,7 +85,7 @@ saved. > + }; > + > + soc { -> + display0: display at di0 { +> + display0: display@di0 { > + compatible = "fsl,imx-parallel-display"; > + interface-pix-fmt = "rgb24"; > + pinctrl-names = "default"; @@ -109,7 +109,7 @@ Can be saved? > +}; > + > +&ecspi1 { -> + lcd_panel: display at 0 { +> + lcd_panel: display@0 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "lg,lg4573"; @@ -136,7 +136,7 @@ Can be saved? > +}; > + > +&i2c3 { -> + atmel: atmel_mxt_ts at 4b { +> + atmel: atmel_mxt_ts@4b { Node name should be generic. @@ -234,7 +234,7 @@ suffix '_80Ohm_clk' can be saved too? > +}; > + > +&i2c3 { -> + atmel: atmel_mxt_ts at 4d { +> + atmel: atmel_mxt_ts@4d { > + compatible = "atmel,maxtouch"; > + reg = <0x4d>; > + interrupt-parent = <&gpio2>; @@ -250,7 +250,7 @@ you put it into imx6qdl-aristainetos2.dtsi? > +&ldb { > + status = "okay"; > + -> + lvds-channel at 0 { +> + lvds-channel@0 { > + fsl,data-mapping = "spwg"; > + fsl,data-width = <24>; > + status = "okay"; @@ -385,7 +385,7 @@ The dma-names should be a property with string value. > + dma-names; > + status = "okay"; > + -> + flash: m25p80 at 1 { +> + flash: m25p80@1 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "micron,n25q128a11"; @@ -399,7 +399,7 @@ The dma-names should be a property with string value. > + pinctrl-0 = <&pinctrl_i2c1>; > + status = "okay"; > + -> + pmic at 58 { +> + pmic@58 { > + compatible = "dialog,da9063"; > + reg = <0x58>; > + interrupt-parent = <&gpio1>; @@ -522,7 +522,7 @@ The dma-names should be a property with string value. Have a new line between nodes. -> + tmp103: tmp103 at 71 { +> + tmp103: tmp103@71 { > + compatible = "ti,tmp103"; > + reg = <0x71>; > + }; @@ -539,14 +539,14 @@ Have a new line between nodes. > + 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>; > + }; @@ -560,14 +560,14 @@ Use macro for clock ID. > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2c4>; > + status = "okay"; -> + eeprom at 50{ +> + eeprom@50{ > + compatible = "atmel,24c64"; > + reg = <0x50>; > + }; Have new line between nodes. -> + eeprom at 57{ +> + eeprom@57{ > + compatible = "atmel,24c64"; > + reg = <0x57>; > + }; @@ -947,6 +947,6 @@ Shawn > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -> the body of a message to majordomo at vger.kernel.org +> the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ diff --git a/a/content_digest b/N2/content_digest index e2f5ded..9accbc2 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,13 @@ "ref\01431334974-27531-1-git-send-email-hs@denx.de\0" - "From\0shawnguo@kernel.org (Shawn Guo)\0" - "Subject\0[PATCH v2] arm, imx6, dts: add DT for aristainetos2 board\0" + "From\0Shawn Guo <shawnguo@kernel.org>\0" + "Subject\0Re: [PATCH v2] arm, imx6, dts: add DT for aristainetos2 board\0" "Date\0Mon, 18 May 2015 19:31:35 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Heiko Schocher <hs@denx.de>\0" + "Cc\0linux-kernel@vger.kernel.org" + Shawn Guo <shawn.guo@linaro.org> + Sascha Hauer <kernel@pengutronix.de> + linux-arm-kernel@lists.infradead.org + " devicetree@vger.kernel.org\0" "\00:1\0" "b\0" "On Mon, May 11, 2015 at 11:02:54AM +0200, Heiko Schocher wrote:\n" @@ -92,7 +97,7 @@ "> +\t};\n" "> +\n" "> +\tsoc {\n" - "> +\t\tdisplay0: display at di0 {\n" + "> +\t\tdisplay0: display@di0 {\n" "> +\t\t\tcompatible = \"fsl,imx-parallel-display\";\n" "> +\t\t\tinterface-pix-fmt = \"rgb24\";\n" "> +\t\t\tpinctrl-names = \"default\";\n" @@ -116,7 +121,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" @@ -143,7 +148,7 @@ "> +};\n" "> +\n" "> +&i2c3 {\n" - "> +\tatmel: atmel_mxt_ts at 4b {\n" + "> +\tatmel: atmel_mxt_ts@4b {\n" "\n" "Node name should be generic.\n" "\n" @@ -241,7 +246,7 @@ "> +};\n" "> +\n" "> +&i2c3 {\n" - "> +\tatmel: atmel_mxt_ts at 4d {\n" + "> +\tatmel: atmel_mxt_ts@4d {\n" "> +\t\tcompatible = \"atmel,maxtouch\";\n" "> +\t\treg = <0x4d>;\n" "> +\t\tinterrupt-parent = <&gpio2>;\n" @@ -257,7 +262,7 @@ "> +&ldb {\n" "> +\tstatus = \"okay\";\n" "> +\n" - "> +\tlvds-channel at 0 {\n" + "> +\tlvds-channel@0 {\n" "> +\t\tfsl,data-mapping = \"spwg\";\n" "> +\t\tfsl,data-width = <24>;\n" "> +\t\tstatus = \"okay\";\n" @@ -392,7 +397,7 @@ "> +\tdma-names;\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" @@ -406,7 +411,7 @@ "> +\tpinctrl-0 = <&pinctrl_i2c1>;\n" "> +\tstatus = \"okay\";\n" "> +\n" - "> +\tpmic at 58 {\n" + "> +\tpmic@58 {\n" "> +\t\tcompatible = \"dialog,da9063\";\n" "> +\t\treg = <0x58>;\n" "> +\t\tinterrupt-parent = <&gpio1>;\n" @@ -529,7 +534,7 @@ "\n" "Have a new line between nodes.\n" "\n" - "> +\ttmp103: tmp103 at 71 {\n" + "> +\ttmp103: tmp103@71 {\n" "> +\t\tcompatible = \"ti,tmp103\";\n" "> +\t\treg = <0x71>;\n" "> +\t};\n" @@ -546,14 +551,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" @@ -567,14 +572,14 @@ "> +\tpinctrl-names = \"default\";\n" "> +\tpinctrl-0 = <&pinctrl_i2c4>;\n" "> +\tstatus = \"okay\";\n" - "> +\teeprom at 50{\n" + "> +\teeprom@50{\n" "> +\t\tcompatible = \"atmel,24c64\";\n" "> +\t\treg = <0x50>;\n" "> +\t};\n" "\n" "Have new line between nodes.\n" "\n" - "> +\teeprom at 57{\n" + "> +\teeprom@57{\n" "> +\t\tcompatible = \"atmel,24c64\";\n" "> +\t\treg = <0x57>;\n" "> +\t};\n" @@ -954,8 +959,8 @@ "> \n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe linux-kernel\" in\n" - "> the body of a message to majordomo at vger.kernel.org\n" + "> the body of a message to majordomo@vger.kernel.org\n" "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > Please read the FAQ at http://www.tux.org/lkml/ -3bdef13a4d4c931637e51fbdf8aaf4fed944e1dd361d1dd2cfa7760fd2abdb04 +23e2e234174c1eed5a3a7f7f8c569809ea88d81fcb856aaaee61c6da41476a88
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.