diff for duplicates of <20141228104654.GA11638@anne> diff --git a/a/1.txt b/N1/1.txt index a3fd779..0155f48 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,7 @@ results in blue color. 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-blackarmor-nas220.dts | 172 ++++++++++++++++++++++ @@ -40,7 +40,7 @@ index 0000000..27fe2f9 +/* + * 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. + */ @@ -74,13 +74,13 @@ index 0000000..27fe2f9 + gpio_keys { + compatible = "gpio-keys"; + -+ button at 1{ ++ button@1{ + label = "Reset"; + linux,code = <KEY_POWER>; + gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; + }; + -+ button at 2{ ++ button@2{ + label = "Power"; + linux,code = <KEY_SLEEP>; + gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; @@ -104,7 +104,7 @@ index 0000000..27fe2f9 + 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"; @@ -116,7 +116,7 @@ index 0000000..27fe2f9 + gpio = <&gpio0 24 GPIO_ACTIVE_LOW>; + }; + -+ sata1_power: regulator at 2 { ++ sata1_power: regulator@2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "SATA1 Power"; @@ -184,7 +184,7 @@ index 0000000..27fe2f9 +&i2c0 { + status = "okay"; + -+ adt7476: thermal at 2e { ++ adt7476: thermal@2e { + compatible = "adi,adt7476"; + reg = <0x2e>; + }; @@ -197,7 +197,7 @@ index 0000000..27fe2f9 +&mdio { + status = "okay"; + -+ ethphy0: ethernet-phy at 8 { ++ ethphy0: ethernet-phy@8 { + reg = <8>; + }; +}; @@ -205,9 +205,14 @@ index 0000000..27fe2f9 +ð0 { + status = "okay"; + -+ ethernet0-port at 0 { ++ ethernet0-port@0 { + phy-handle = <ðphy0>; + }; +}; -- 1.7.10.4 + +-- +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 86cd367..ca911d8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,14 @@ "ref\020141215203855.GA28940@anne\0" - "From\0evgeni@studio-punkt.com (Evgeni Dobrev)\0" + "From\0Evgeni Dobrev <evgeni-c3HRhe8yoGxdzLpqerNdyw@public.gmane.org>\0" "Subject\0[PATCH v4 1/1] add support for Seagate BlackArmor NAS220\0" "Date\0Sun, 28 Dec 2014 11:46:54 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "Cc\0linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org> + Sebastian Hesselbarth <sebastian.hesselbarth-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> + Gregory Clement <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> + " Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>\0" "\00:1\0" "b\0" "This patch adds support for Seagate BlackArmor NAS220.\n" @@ -19,7 +25,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-blackarmor-nas220.dts | 172 ++++++++++++++++++++++\n" @@ -47,7 +53,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" @@ -81,13 +87,13 @@ "+\tgpio_keys {\n" "+\t\tcompatible = \"gpio-keys\";\n" "+\n" - "+\t\tbutton at 1{\n" + "+\t\tbutton@1{\n" "+\t\t\tlabel = \"Reset\";\n" "+\t\t\tlinux,code = <KEY_POWER>;\n" "+\t\t\tgpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;\n" "+\t\t};\n" "+\n" - "+\t\tbutton at 2{\n" + "+\t\tbutton@2{\n" "+\t\t\tlabel = \"Power\";\n" "+\t\t\tlinux,code = <KEY_SLEEP>;\n" "+\t\t\tgpios = <&gpio0 26 GPIO_ACTIVE_LOW>;\n" @@ -111,7 +117,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" @@ -123,7 +129,7 @@ "+\t\t\tgpio = <&gpio0 24 GPIO_ACTIVE_LOW>;\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" @@ -191,7 +197,7 @@ "+&i2c0 {\n" "+\tstatus = \"okay\";\n" "+\n" - "+\tadt7476: thermal at 2e {\n" + "+\tadt7476: thermal@2e {\n" "+\t\tcompatible = \"adi,adt7476\";\n" "+\t\treg = <0x2e>;\n" "+\t};\n" @@ -204,7 +210,7 @@ "+&mdio {\n" "+\tstatus = \"okay\";\n" "+\n" - "+\tethphy0: ethernet-phy at 8 {\n" + "+\tethphy0: ethernet-phy@8 {\n" "+\t\t reg = <8>;\n" "+\t};\n" "+};\n" @@ -212,11 +218,16 @@ "+ð0 {\n" "+\tstatus = \"okay\";\n" "+\n" - "+\tethernet0-port at 0 {\n" + "+\tethernet0-port@0 {\n" "+\t\tphy-handle = <ðphy0>;\n" "+\t};\n" "+};\n" "-- \n" - 1.7.10.4 + "1.7.10.4\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 -25db992ef4b2807e198d699202dcbe3c61eacfe3a8f299b20696dbf823197654 +9a34df5f2e33eba33122de4dafb4d6455612675c8485940aa6ef2c3072741f4a
diff --git a/a/1.txt b/N2/1.txt index a3fd779..00f0743 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -74,13 +74,13 @@ index 0000000..27fe2f9 + gpio_keys { + compatible = "gpio-keys"; + -+ button at 1{ ++ button@1{ + label = "Reset"; + linux,code = <KEY_POWER>; + gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; + }; + -+ button at 2{ ++ button@2{ + label = "Power"; + linux,code = <KEY_SLEEP>; + gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; @@ -104,7 +104,7 @@ index 0000000..27fe2f9 + 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"; @@ -116,7 +116,7 @@ index 0000000..27fe2f9 + gpio = <&gpio0 24 GPIO_ACTIVE_LOW>; + }; + -+ sata1_power: regulator at 2 { ++ sata1_power: regulator@2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "SATA1 Power"; @@ -184,7 +184,7 @@ index 0000000..27fe2f9 +&i2c0 { + status = "okay"; + -+ adt7476: thermal at 2e { ++ adt7476: thermal@2e { + compatible = "adi,adt7476"; + reg = <0x2e>; + }; @@ -197,7 +197,7 @@ index 0000000..27fe2f9 +&mdio { + status = "okay"; + -+ ethphy0: ethernet-phy at 8 { ++ ethphy0: ethernet-phy@8 { + reg = <8>; + }; +}; @@ -205,7 +205,7 @@ index 0000000..27fe2f9 +ð0 { + status = "okay"; + -+ ethernet0-port at 0 { ++ ethernet0-port@0 { + phy-handle = <ðphy0>; + }; +}; diff --git a/a/content_digest b/N2/content_digest index 86cd367..b6c1022 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,14 @@ "ref\020141215203855.GA28940@anne\0" - "From\0evgeni@studio-punkt.com (Evgeni Dobrev)\0" + "From\0Evgeni Dobrev <evgeni@studio-punkt.com>\0" "Subject\0[PATCH v4 1/1] add support for Seagate BlackArmor NAS220\0" "Date\0Sun, 28 Dec 2014 11:46:54 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0devicetree@vger.kernel.org\0" + "Cc\0linux-kernel@vger.kernel.org" + linux-arm-kernel@lists.infradead.org + Jason Cooper <jason@lakedaemon.net> + Sebastian Hesselbarth <sebastian.hesselbarth@googlemail.com> + Gregory Clement <gregory.clement@free-electrons.com> + " Andrew Lunn <andrew@lunn.ch>\0" "\00:1\0" "b\0" "This patch adds support for Seagate BlackArmor NAS220.\n" @@ -81,13 +87,13 @@ "+\tgpio_keys {\n" "+\t\tcompatible = \"gpio-keys\";\n" "+\n" - "+\t\tbutton at 1{\n" + "+\t\tbutton@1{\n" "+\t\t\tlabel = \"Reset\";\n" "+\t\t\tlinux,code = <KEY_POWER>;\n" "+\t\t\tgpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;\n" "+\t\t};\n" "+\n" - "+\t\tbutton at 2{\n" + "+\t\tbutton@2{\n" "+\t\t\tlabel = \"Power\";\n" "+\t\t\tlinux,code = <KEY_SLEEP>;\n" "+\t\t\tgpios = <&gpio0 26 GPIO_ACTIVE_LOW>;\n" @@ -111,7 +117,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" @@ -123,7 +129,7 @@ "+\t\t\tgpio = <&gpio0 24 GPIO_ACTIVE_LOW>;\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" @@ -191,7 +197,7 @@ "+&i2c0 {\n" "+\tstatus = \"okay\";\n" "+\n" - "+\tadt7476: thermal at 2e {\n" + "+\tadt7476: thermal@2e {\n" "+\t\tcompatible = \"adi,adt7476\";\n" "+\t\treg = <0x2e>;\n" "+\t};\n" @@ -204,7 +210,7 @@ "+&mdio {\n" "+\tstatus = \"okay\";\n" "+\n" - "+\tethphy0: ethernet-phy at 8 {\n" + "+\tethphy0: ethernet-phy@8 {\n" "+\t\t reg = <8>;\n" "+\t};\n" "+};\n" @@ -212,11 +218,11 @@ "+ð0 {\n" "+\tstatus = \"okay\";\n" "+\n" - "+\tethernet0-port at 0 {\n" + "+\tethernet0-port@0 {\n" "+\t\tphy-handle = <ðphy0>;\n" "+\t};\n" "+};\n" "-- \n" 1.7.10.4 -25db992ef4b2807e198d699202dcbe3c61eacfe3a8f299b20696dbf823197654 +3c82c5802b949fb2c304dd27d46a956c777fbf07dbe5dc2ad3bfb4004f50d454
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.