diff for duplicates of <20141222100222.GF32716@lunn.ch> diff --git a/a/1.txt b/N1/1.txt index 6f7b21c..b3f7850 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,7 @@ serial node. > > The third led is wired to show the SATA activity on the two drives. > -> Signed-off-by: Evgeni Dobrev <evgeni@studio-punkt.com> +> Signed-off-by: Evgeni Dobrev <evgeni-c3HRhe8yoGxdzLpqerNdyw@public.gmane.org> > --- > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/kirkwood-nas220.dts | 158 +++++++++++++++++++++++++++++++++ @@ -49,7 +49,7 @@ serial node. > +/* > + * Device Tree file for Seagate BlackArmor NAS220 > + * -> + * Copyright (C) 2014 Evgeni Dobrev <evgeni@studio-punkt.com> +> + * Copyright (C) 2014 Evgeni Dobrev <evgeni-c3HRhe8yoGxdzLpqerNdyw@public.gmane.org> > + * > + * Licensed under GPLv2 or later. > + */ @@ -75,8 +75,8 @@ serial node. > + stdout-path = &uart0; > + }; > + -> + ocp at f1000000 { -> + pinctrl: pin-controller at 10000 { +> + ocp@f1000000 { +> + pinctrl: pin-controller@10000 { > + pinctrl-0 = <&pmx_uart0 > + &pmx_button_reset > + &pmx_button_power>; @@ -108,18 +108,18 @@ serial node. > + }; > + }; > + -> + serial at 12000 { +> + serial@12000 { > + status = "okay"; > + }; > + -> + sata at 80000 { +> + sata@80000 { > + status = "okay"; > + nr-ports = <2>; > + }; > + -> + i2c at 11000 { +> + i2c@11000 { > + status = "okay"; -> + adt7476: adt7476a at 2e { +> + adt7476: adt7476a@2e { > + compatible = "adi,adt7476"; > + reg = <0x2e>; > + }; @@ -133,12 +133,12 @@ serial node. > + > + gpio_keys { > + compatible = "gpio-keys"; -> + button at 1{ +> + button@1{ > + label = "Reset push button"; > + linux,code = <KEY_POWER>; > + gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; > + }; -> + button at 2{ +> + button@2{ > + label = "Power push button"; > + linux,code = <KEY_SLEEP>; > + gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; @@ -161,7 +161,7 @@ serial node. > + pinctrl-0 = <&pmx_power_sata0 &pmx_power_sata1>; > + pinctrl-names = "default"; > + -> + sata0_power: regulator at 1 { +> + sata0_power: regulator@1 { > + compatible = "regulator-fixed"; > + reg = <1>; > + regulator-name = "SATA0 Power"; @@ -173,7 +173,7 @@ serial node. > + gpio = <&gpio0 24 0>; > + }; > + -> + sata1_power: regulator at 2 { +> + sata1_power: regulator@2 { > + compatible = "regulator-fixed"; > + reg = <2>; > + regulator-name = "SATA1 Power"; @@ -193,14 +193,14 @@ serial node. > + > +&mdio { > + status = "okay"; -> + ethphy0: ethernet-phy at 8 { +> + ethphy0: ethernet-phy@8 { > + reg = <8>; > + }; > +}; > + > +ð0 { > + status = "okay"; -> + ethernet0-port at 0 { +> + ethernet0-port@0 { > + phy-handle = <ðphy0>; > + }; > +}; @@ -210,5 +210,9 @@ serial node. > > _______________________________________________ > linux-arm-kernel mailing list -> linux-arm-kernel at lists.infradead.org +> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel +-- +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 a3c2eaa..b6d2460 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,15 @@ "ref\020141215203855.GA28940@anne\0" "ref\020141222080445.GA15292@anne\0" - "From\0andrew@lunn.ch (Andrew Lunn)\0" - "Subject\0[PATCH v2 1/1] add support for Seagate BlackArmor NAS220\0" + "From\0Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>\0" + "Subject\0Re: [PATCH v2 1/1] add support for Seagate BlackArmor NAS220\0" "Date\0Mon, 22 Dec 2014 11:02:22 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Evgeni Dobrev <evgeni-c3HRhe8yoGxdzLpqerNdyw@public.gmane.org>\0" + "Cc\0devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org> + Sebastian Hesselbarth <sebastian.hesselbarth-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Gregory Clement <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "On Mon, Dec 22, 2014 at 09:04:45AM +0100, Evgeni Dobrev wrote:\n" @@ -29,7 +35,7 @@ "> \n" "> The third led is wired to show the SATA activity on the two drives.\n" "> \n" - "> Signed-off-by: Evgeni Dobrev <evgeni@studio-punkt.com>\n" + "> Signed-off-by: Evgeni Dobrev <evgeni-c3HRhe8yoGxdzLpqerNdyw@public.gmane.org>\n" "> ---\n" "> arch/arm/boot/dts/Makefile | 1 +\n" "> arch/arm/boot/dts/kirkwood-nas220.dts | 158 +++++++++++++++++++++++++++++++++\n" @@ -57,7 +63,7 @@ "> +/*\n" "> + * Device Tree file for Seagate BlackArmor NAS220\n" "> + *\n" - "> + * Copyright (C) 2014 Evgeni Dobrev <evgeni@studio-punkt.com>\n" + "> + * Copyright (C) 2014 Evgeni Dobrev <evgeni-c3HRhe8yoGxdzLpqerNdyw@public.gmane.org>\n" "> + *\n" "> + * Licensed under GPLv2 or later.\n" "> + */\n" @@ -83,8 +89,8 @@ "> +\t\tstdout-path = &uart0;\n" "> +\t};\n" "> +\n" - "> +\tocp at f1000000 {\n" - "> +\t\tpinctrl: pin-controller at 10000 {\n" + "> +\tocp@f1000000 {\n" + "> +\t\tpinctrl: pin-controller@10000 {\n" "> +\t\t\tpinctrl-0 = <&pmx_uart0\n" "> +\t\t\t\t &pmx_button_reset\n" "> +\t\t\t\t &pmx_button_power>;\n" @@ -116,18 +122,18 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tserial at 12000 {\n" + "> +\t\tserial@12000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tsata at 80000 {\n" + "> +\t\tsata@80000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t\tnr-ports = <2>;\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c at 11000 {\n" + "> +\t\ti2c@11000 {\n" "> +\t\t\tstatus = \"okay\";\n" - "> +\t\t\tadt7476: adt7476a at 2e {\n" + "> +\t\t\tadt7476: adt7476a@2e {\n" "> +\t\t\t\tcompatible = \"adi,adt7476\";\n" "> +\t\t\t\treg = <0x2e>;\n" "> +\t\t\t};\n" @@ -141,12 +147,12 @@ "> +\n" "> +\tgpio_keys {\n" "> +\t\tcompatible = \"gpio-keys\";\n" - "> +\t\tbutton at 1{\n" + "> +\t\tbutton@1{\n" "> +\t\t\tlabel = \"Reset push button\";\n" "> +\t\t\tlinux,code = <KEY_POWER>;\n" "> +\t\t\tgpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;\n" "> +\t\t};\n" - "> +\t\tbutton at 2{\n" + "> +\t\tbutton@2{\n" "> +\t\t\tlabel = \"Power push button\";\n" "> +\t\t\tlinux,code = <KEY_SLEEP>;\n" "> +\t\t\tgpios = <&gpio0 26 GPIO_ACTIVE_LOW>;\n" @@ -169,7 +175,7 @@ "> +\t\tpinctrl-0 = <&pmx_power_sata0 &pmx_power_sata1>;\n" "> +\t\tpinctrl-names = \"default\";\n" "> +\n" - "> +\t\tsata0_power: regulator at 1 {\n" + "> +\t\tsata0_power: regulator@1 {\n" "> +\t\t\tcompatible = \"regulator-fixed\";\n" "> +\t\t\treg = <1>;\n" "> +\t\t\tregulator-name = \"SATA0 Power\";\n" @@ -181,7 +187,7 @@ "> +\t\t\tgpio = <&gpio0 24 0>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tsata1_power: regulator at 2 {\n" + "> +\t\tsata1_power: regulator@2 {\n" "> +\t\t\tcompatible = \"regulator-fixed\";\n" "> +\t\t\treg = <2>;\n" "> +\t\t\tregulator-name = \"SATA1 Power\";\n" @@ -201,14 +207,14 @@ "> +\n" "> +&mdio {\n" "> +\tstatus = \"okay\";\n" - "> +\tethphy0: ethernet-phy at 8 {\n" + "> +\tethphy0: ethernet-phy@8 {\n" "> +\t\t reg = <8>;\n" "> +\t };\n" "> +};\n" "> +\n" "> +ð0 {\n" "> +\tstatus = \"okay\";\n" - "> +\tethernet0-port at 0 {\n" + "> +\tethernet0-port@0 {\n" "> +\t\tphy-handle = <ðphy0>;\n" "> +\t};\n" "> +};\n" @@ -218,7 +224,11 @@ "> \n" "> _______________________________________________\n" "> linux-arm-kernel mailing list\n" - "> linux-arm-kernel at lists.infradead.org\n" - > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel + "> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\n" + "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\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 -ba39e5a967f234aa1cce18e6e75484ce3286ea385a47a2d75c3c140545e7d4b9 +539214b56e997ee99afb3df699b3fb26f7d0f1bb8ae6838162124a91b66d214d
diff --git a/a/1.txt b/N2/1.txt index 6f7b21c..0535953 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -75,8 +75,8 @@ serial node. > + stdout-path = &uart0; > + }; > + -> + ocp at f1000000 { -> + pinctrl: pin-controller at 10000 { +> + ocp@f1000000 { +> + pinctrl: pin-controller@10000 { > + pinctrl-0 = <&pmx_uart0 > + &pmx_button_reset > + &pmx_button_power>; @@ -108,18 +108,18 @@ serial node. > + }; > + }; > + -> + serial at 12000 { +> + serial@12000 { > + status = "okay"; > + }; > + -> + sata at 80000 { +> + sata@80000 { > + status = "okay"; > + nr-ports = <2>; > + }; > + -> + i2c at 11000 { +> + i2c@11000 { > + status = "okay"; -> + adt7476: adt7476a at 2e { +> + adt7476: adt7476a@2e { > + compatible = "adi,adt7476"; > + reg = <0x2e>; > + }; @@ -133,12 +133,12 @@ serial node. > + > + gpio_keys { > + compatible = "gpio-keys"; -> + button at 1{ +> + button@1{ > + label = "Reset push button"; > + linux,code = <KEY_POWER>; > + gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; > + }; -> + button at 2{ +> + button@2{ > + label = "Power push button"; > + linux,code = <KEY_SLEEP>; > + gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; @@ -161,7 +161,7 @@ serial node. > + pinctrl-0 = <&pmx_power_sata0 &pmx_power_sata1>; > + pinctrl-names = "default"; > + -> + sata0_power: regulator at 1 { +> + sata0_power: regulator@1 { > + compatible = "regulator-fixed"; > + reg = <1>; > + regulator-name = "SATA0 Power"; @@ -173,7 +173,7 @@ serial node. > + gpio = <&gpio0 24 0>; > + }; > + -> + sata1_power: regulator at 2 { +> + sata1_power: regulator@2 { > + compatible = "regulator-fixed"; > + reg = <2>; > + regulator-name = "SATA1 Power"; @@ -193,14 +193,14 @@ serial node. > + > +&mdio { > + status = "okay"; -> + ethphy0: ethernet-phy at 8 { +> + ethphy0: ethernet-phy@8 { > + reg = <8>; > + }; > +}; > + > +ð0 { > + status = "okay"; -> + ethernet0-port at 0 { +> + ethernet0-port@0 { > + phy-handle = <ðphy0>; > + }; > +}; @@ -210,5 +210,5 @@ serial node. > > _______________________________________________ > linux-arm-kernel mailing list -> linux-arm-kernel at lists.infradead.org +> linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N2/content_digest index a3c2eaa..cab9a19 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,15 @@ "ref\020141215203855.GA28940@anne\0" "ref\020141222080445.GA15292@anne\0" - "From\0andrew@lunn.ch (Andrew Lunn)\0" - "Subject\0[PATCH v2 1/1] add support for Seagate BlackArmor NAS220\0" + "From\0Andrew Lunn <andrew@lunn.ch>\0" + "Subject\0Re: [PATCH v2 1/1] add support for Seagate BlackArmor NAS220\0" "Date\0Mon, 22 Dec 2014 11:02:22 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Evgeni Dobrev <evgeni@studio-punkt.com>\0" + "Cc\0devicetree@vger.kernel.org" + Jason Cooper <jason@lakedaemon.net> + Sebastian Hesselbarth <sebastian.hesselbarth@googlemail.com> + linux-kernel@vger.kernel.org + Gregory Clement <gregory.clement@free-electrons.com> + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Mon, Dec 22, 2014 at 09:04:45AM +0100, Evgeni Dobrev wrote:\n" @@ -83,8 +89,8 @@ "> +\t\tstdout-path = &uart0;\n" "> +\t};\n" "> +\n" - "> +\tocp at f1000000 {\n" - "> +\t\tpinctrl: pin-controller at 10000 {\n" + "> +\tocp@f1000000 {\n" + "> +\t\tpinctrl: pin-controller@10000 {\n" "> +\t\t\tpinctrl-0 = <&pmx_uart0\n" "> +\t\t\t\t &pmx_button_reset\n" "> +\t\t\t\t &pmx_button_power>;\n" @@ -116,18 +122,18 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tserial at 12000 {\n" + "> +\t\tserial@12000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tsata at 80000 {\n" + "> +\t\tsata@80000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t\tnr-ports = <2>;\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c at 11000 {\n" + "> +\t\ti2c@11000 {\n" "> +\t\t\tstatus = \"okay\";\n" - "> +\t\t\tadt7476: adt7476a at 2e {\n" + "> +\t\t\tadt7476: adt7476a@2e {\n" "> +\t\t\t\tcompatible = \"adi,adt7476\";\n" "> +\t\t\t\treg = <0x2e>;\n" "> +\t\t\t};\n" @@ -141,12 +147,12 @@ "> +\n" "> +\tgpio_keys {\n" "> +\t\tcompatible = \"gpio-keys\";\n" - "> +\t\tbutton at 1{\n" + "> +\t\tbutton@1{\n" "> +\t\t\tlabel = \"Reset push button\";\n" "> +\t\t\tlinux,code = <KEY_POWER>;\n" "> +\t\t\tgpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;\n" "> +\t\t};\n" - "> +\t\tbutton at 2{\n" + "> +\t\tbutton@2{\n" "> +\t\t\tlabel = \"Power push button\";\n" "> +\t\t\tlinux,code = <KEY_SLEEP>;\n" "> +\t\t\tgpios = <&gpio0 26 GPIO_ACTIVE_LOW>;\n" @@ -169,7 +175,7 @@ "> +\t\tpinctrl-0 = <&pmx_power_sata0 &pmx_power_sata1>;\n" "> +\t\tpinctrl-names = \"default\";\n" "> +\n" - "> +\t\tsata0_power: regulator at 1 {\n" + "> +\t\tsata0_power: regulator@1 {\n" "> +\t\t\tcompatible = \"regulator-fixed\";\n" "> +\t\t\treg = <1>;\n" "> +\t\t\tregulator-name = \"SATA0 Power\";\n" @@ -181,7 +187,7 @@ "> +\t\t\tgpio = <&gpio0 24 0>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tsata1_power: regulator at 2 {\n" + "> +\t\tsata1_power: regulator@2 {\n" "> +\t\t\tcompatible = \"regulator-fixed\";\n" "> +\t\t\treg = <2>;\n" "> +\t\t\tregulator-name = \"SATA1 Power\";\n" @@ -201,14 +207,14 @@ "> +\n" "> +&mdio {\n" "> +\tstatus = \"okay\";\n" - "> +\tethphy0: ethernet-phy at 8 {\n" + "> +\tethphy0: ethernet-phy@8 {\n" "> +\t\t reg = <8>;\n" "> +\t };\n" "> +};\n" "> +\n" "> +ð0 {\n" "> +\tstatus = \"okay\";\n" - "> +\tethernet0-port at 0 {\n" + "> +\tethernet0-port@0 {\n" "> +\t\tphy-handle = <ðphy0>;\n" "> +\t};\n" "> +};\n" @@ -218,7 +224,7 @@ "> \n" "> _______________________________________________\n" "> linux-arm-kernel mailing list\n" - "> linux-arm-kernel at lists.infradead.org\n" + "> linux-arm-kernel@lists.infradead.org\n" > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -ba39e5a967f234aa1cce18e6e75484ce3286ea385a47a2d75c3c140545e7d4b9 +4177c1ae48e72c701eed65aa923e2ccf9e16f87cc7b50ea5f02d0520b35f0b76
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.