diff for duplicates of <20180205060558.GD31354@dragon> diff --git a/a/1.txt b/N1/1.txt index 6345646..06ff751 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,7 +5,7 @@ On Fri, Jan 19, 2018 at 01:11:25AM +0100, Stefan Agner wrote: > maintaining shared configuration in imx6ull-colibri.dtsi and > imx6ull-colibri-eval-v3.dtsi respectively. > -> Signed-off-by: Stefan Agner <stefan@agner.ch> +> Signed-off-by: Stefan Agner <stefan-XLVq0VzYD2Y@public.gmane.org> > --- > This depends on the following patchsets work: > - https://lkml.org/lkml/2018/1/6/129 (applied) @@ -148,7 +148,7 @@ Drop the newline. > +&ecspi1 { > + status = "okay"; > + -> + mcp2515: can at 0 { +> + mcp2515: can@0 { > + compatible = "microchip,mcp2515"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_can_int>; @@ -167,7 +167,7 @@ Drop the newline. > + status = "okay"; > + > + /* M41T0M6 real time clock on carrier board */ -> + rtc: m41t0m6 at 68 { +> + rtc: m41t0m6@68 { m41t0m6: rtc @@ -450,7 +450,7 @@ Move 'status' to bottom of property list. > + #address-cells = <1>; > + #size-cells = <0>; > + -> + ethphy1: ethernet-phy at 2 { +> + ethphy1: ethernet-phy@2 { > + compatible = "ethernet-phy-ieee802.3-c22"; > + max-speed = <100>; > + reg = <2>; @@ -482,7 +482,7 @@ Move 'status' to bottom of property list. > + scl-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>; > + status = "okay"; > + -> + ad7879 at 2c { +> + ad7879@2c { > + compatible = "adi,ad7879-1"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_snvs_ad7879_int>; @@ -946,4 +946,8 @@ Shawn > + > -- > 2.15.1 -> +> +-- +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 c9ca978..c03c503 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,18 @@ "ref\020180119001125.20650-1-stefan@agner.ch\0" - "From\0shawnguo@kernel.org (Shawn Guo)\0" - "Subject\0[PATCH] ARM: dts: imx6ull: add Toradex Colibri iMX6ULL support\0" + "ref\020180119001125.20650-1-stefan-XLVq0VzYD2Y@public.gmane.org\0" + "From\0Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" + "Subject\0Re: [PATCH] ARM: dts: imx6ull: add Toradex Colibri iMX6ULL support\0" "Date\0Mon, 5 Feb 2018 14:06:00 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Stefan Agner <stefan-XLVq0VzYD2Y@public.gmane.org>\0" + "Cc\0kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org" + fabio.estevam-3arQi8VN3Tc@public.gmane.org + robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org + mark.rutland-5wv7dgnIgG8@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + max.oss.09-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org + " marcel.ziswiler-2KBjVHiyJgBBDgjK7y7TUQ@public.gmane.org\0" "\00:1\0" "b\0" "On Fri, Jan 19, 2018 at 01:11:25AM +0100, Stefan Agner wrote:\n" @@ -12,7 +22,7 @@ "> maintaining shared configuration in imx6ull-colibri.dtsi and\n" "> imx6ull-colibri-eval-v3.dtsi respectively.\n" "> \n" - "> Signed-off-by: Stefan Agner <stefan@agner.ch>\n" + "> Signed-off-by: Stefan Agner <stefan-XLVq0VzYD2Y@public.gmane.org>\n" "> ---\n" "> This depends on the following patchsets work:\n" "> - https://lkml.org/lkml/2018/1/6/129 (applied)\n" @@ -155,7 +165,7 @@ "> +&ecspi1 {\n" "> +\tstatus = \"okay\";\n" "> +\n" - "> +\tmcp2515: can at 0 {\n" + "> +\tmcp2515: can@0 {\n" "> +\t\tcompatible = \"microchip,mcp2515\";\n" "> +\t\tpinctrl-names = \"default\";\n" "> +\t\tpinctrl-0 = <&pinctrl_can_int>;\n" @@ -174,7 +184,7 @@ "> +\tstatus = \"okay\";\n" "> +\n" "> +\t/* M41T0M6 real time clock on carrier board */\n" - "> +\trtc: m41t0m6 at 68 {\n" + "> +\trtc: m41t0m6@68 {\n" "\n" "m41t0m6: rtc\n" "\n" @@ -457,7 +467,7 @@ "> +\t\t#address-cells = <1>;\n" "> +\t\t#size-cells = <0>;\n" "> +\n" - "> +\t\tethphy1: ethernet-phy at 2 {\n" + "> +\t\tethphy1: ethernet-phy@2 {\n" "> +\t\t\tcompatible = \"ethernet-phy-ieee802.3-c22\";\n" "> +\t\t\tmax-speed = <100>;\n" "> +\t\t\treg = <2>;\n" @@ -489,7 +499,7 @@ "> +\tscl-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;\n" "> +\tstatus = \"okay\";\n" "> +\n" - "> +\tad7879 at 2c {\n" + "> +\tad7879@2c {\n" "> +\t\tcompatible = \"adi,ad7879-1\";\n" "> +\t\tpinctrl-names = \"default\";\n" "> +\t\tpinctrl-0 = <&pinctrl_snvs_ad7879_int>;\n" @@ -953,6 +963,10 @@ "> +\n" "> -- \n" "> 2.15.1\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 -3617606b88e6f5e477a5e8a30b6280de919d48584b9bf2d7b79ee7545b945036 +88f7f3e7a3e41acf5797183182517f3de795145ecde89e11b4972f7de5533e3f
diff --git a/a/1.txt b/N2/1.txt index 6345646..71116d9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -148,7 +148,7 @@ Drop the newline. > +&ecspi1 { > + status = "okay"; > + -> + mcp2515: can at 0 { +> + mcp2515: can@0 { > + compatible = "microchip,mcp2515"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_can_int>; @@ -167,7 +167,7 @@ Drop the newline. > + status = "okay"; > + > + /* M41T0M6 real time clock on carrier board */ -> + rtc: m41t0m6 at 68 { +> + rtc: m41t0m6@68 { m41t0m6: rtc @@ -450,7 +450,7 @@ Move 'status' to bottom of property list. > + #address-cells = <1>; > + #size-cells = <0>; > + -> + ethphy1: ethernet-phy at 2 { +> + ethphy1: ethernet-phy@2 { > + compatible = "ethernet-phy-ieee802.3-c22"; > + max-speed = <100>; > + reg = <2>; @@ -482,7 +482,7 @@ Move 'status' to bottom of property list. > + scl-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>; > + status = "okay"; > + -> + ad7879 at 2c { +> + ad7879@2c { > + compatible = "adi,ad7879-1"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_snvs_ad7879_int>; diff --git a/a/content_digest b/N2/content_digest index c9ca978..7532f5d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,17 @@ "ref\020180119001125.20650-1-stefan@agner.ch\0" - "From\0shawnguo@kernel.org (Shawn Guo)\0" - "Subject\0[PATCH] ARM: dts: imx6ull: add Toradex Colibri iMX6ULL support\0" + "From\0Shawn Guo <shawnguo@kernel.org>\0" + "Subject\0Re: [PATCH] ARM: dts: imx6ull: add Toradex Colibri iMX6ULL support\0" "Date\0Mon, 5 Feb 2018 14:06:00 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Stefan Agner <stefan@agner.ch>\0" + "Cc\0kernel@pengutronix.de" + fabio.estevam@nxp.com + robh+dt@kernel.org + mark.rutland@arm.com + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + max.oss.09@gmail.com + " marcel.ziswiler@toradex.com\0" "\00:1\0" "b\0" "On Fri, Jan 19, 2018 at 01:11:25AM +0100, Stefan Agner wrote:\n" @@ -155,7 +164,7 @@ "> +&ecspi1 {\n" "> +\tstatus = \"okay\";\n" "> +\n" - "> +\tmcp2515: can at 0 {\n" + "> +\tmcp2515: can@0 {\n" "> +\t\tcompatible = \"microchip,mcp2515\";\n" "> +\t\tpinctrl-names = \"default\";\n" "> +\t\tpinctrl-0 = <&pinctrl_can_int>;\n" @@ -174,7 +183,7 @@ "> +\tstatus = \"okay\";\n" "> +\n" "> +\t/* M41T0M6 real time clock on carrier board */\n" - "> +\trtc: m41t0m6 at 68 {\n" + "> +\trtc: m41t0m6@68 {\n" "\n" "m41t0m6: rtc\n" "\n" @@ -457,7 +466,7 @@ "> +\t\t#address-cells = <1>;\n" "> +\t\t#size-cells = <0>;\n" "> +\n" - "> +\t\tethphy1: ethernet-phy at 2 {\n" + "> +\t\tethphy1: ethernet-phy@2 {\n" "> +\t\t\tcompatible = \"ethernet-phy-ieee802.3-c22\";\n" "> +\t\t\tmax-speed = <100>;\n" "> +\t\t\treg = <2>;\n" @@ -489,7 +498,7 @@ "> +\tscl-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;\n" "> +\tstatus = \"okay\";\n" "> +\n" - "> +\tad7879 at 2c {\n" + "> +\tad7879@2c {\n" "> +\t\tcompatible = \"adi,ad7879-1\";\n" "> +\t\tpinctrl-names = \"default\";\n" "> +\t\tpinctrl-0 = <&pinctrl_snvs_ad7879_int>;\n" @@ -955,4 +964,4 @@ "> 2.15.1\n" > -3617606b88e6f5e477a5e8a30b6280de919d48584b9bf2d7b79ee7545b945036 +419d03765adc16f005275592344de2f2a143fd1515702d9f77c34527d8f8bf5b
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.