diff for duplicates of <87a8rokq7f.fsf@free-electrons.com> diff --git a/a/1.txt b/N1/1.txt index 971e31a..520f622 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,48 +25,48 @@ Gregory > }; > > - /* Two rear eSATA ports */ -> - sata at a0000 { +> - sata@a0000 { > - nr-ports = <2>; > - status = "okay"; > - }; > - -> - serial at 12000 { +> - serial@12000 { > - status = "okay"; > - }; > - > - mdio { -> - phy0: ethernet-phy at 0 { /* Marvell 88E1318 */ +> - phy0: ethernet-phy@0 { /* Marvell 88E1318 */ > - reg = <0>; > - }; > - -> - phy1: ethernet-phy at 1 { /* Marvell 88E1318 */ +> - phy1: ethernet-phy@1 { /* Marvell 88E1318 */ > - reg = <1>; > - }; > - }; > - -> - ethernet at 70000 { +> - ethernet@70000 { > - status = "okay"; > - phy = <&phy0>; > - phy-mode = "rgmii-id"; > - }; > - -> - ethernet at 74000 { +> - ethernet@74000 { > - status = "okay"; > - phy = <&phy1>; > - phy-mode = "rgmii-id"; > - }; > - > - /* Front USB 2.0 port */ -> - usb at 50000 { +> - usb@50000 { > - status = "okay"; > - }; > - -> i2c at 11000 { +> i2c@11000 { > compatible = "marvell,mv64xxx-i2c"; > clock-frequency = <400000>; > status = "okay"; > -> - isl12057: isl12057 at 68 { +> - isl12057: isl12057@68 { > - compatible = "isil,isl12057"; > - reg = <0x68>; > - isil,irq2-can-wakeup-machine; @@ -74,57 +74,57 @@ Gregory > - > /* Controller for rear fan #1 of 3 (Protechnic > * MGT4012XB-O20, 8000RPM) near eSATA port */ -> g762_fan1: g762 at 3e { +> g762_fan1: g762@3e { > @@ -178,6 +135,49 @@ > compatible = "gmt,g751"; > reg = <0x4c>; > }; > + -> + isl12057: isl12057 at 68 { +> + isl12057: isl12057@68 { > + compatible = "isil,isl12057"; > + reg = <0x68>; > + isil,irq2-can-wakeup-machine; > + }; > + }; > + -> + serial at 12000 { +> + serial@12000 { > + status = "okay"; > + }; > + > + /* Front USB 2.0 port */ -> + usb at 50000 { +> + usb@50000 { > + status = "okay"; > + }; > + > + mdio { -> + phy0: ethernet-phy at 0 { /* Marvell 88E1318 */ +> + phy0: ethernet-phy@0 { /* Marvell 88E1318 */ > + reg = <0>; > + }; > + -> + phy1: ethernet-phy at 1 { /* Marvell 88E1318 */ +> + phy1: ethernet-phy@1 { /* Marvell 88E1318 */ > + reg = <1>; > + }; > + }; > + -> + ethernet at 70000 { +> + ethernet@70000 { > + status = "okay"; > + phy = <&phy0>; > + phy-mode = "rgmii-id"; > + }; > + -> + ethernet at 74000 { +> + ethernet@74000 { > + status = "okay"; > + phy = <&phy1>; > + phy-mode = "rgmii-id"; > + }; > + > + /* Two rear eSATA ports */ -> + sata at a0000 { +> + sata@a0000 { > + nr-ports = <2>; > + status = "okay"; > }; > -> nand at d0000 { +> nand@d0000 { > -- > 2.5.3 > diff --git a/a/content_digest b/N1/content_digest index f2fd34c..8c545aa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,22 @@ "ref\0cover.1444428035.git.arno@natisbad.org\0" "ref\0277de75473af2431849a7494ae65b57dbc9a8309.1444428035.git.arno@natisbad.org\0" - "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" - "Subject\0[PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file\0" + "From\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0" + "Subject\0Re: [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file\0" "Date\0Mon, 12 Oct 2015 18:27:00 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Arnaud Ebalard <arno@natisbad.org>\0" + "Cc\0Jason Cooper <jason@lakedaemon.net>" + Andrew Lunn <andrew@lunn.ch> + Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> + Rob Herring <robh+dt@kernel.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + Russell King <linux@arm.linux.org.uk> + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + " TuxOholic <tuxoholic@hotmail.de>\0" "\00:1\0" "b\0" "Hi Arnaud,\n" @@ -33,48 +46,48 @@ "> \t\t\t};\n" "> \n" "> -\t\t\t/* Two rear eSATA ports */\n" - "> -\t\t\tsata at a0000 {\n" + "> -\t\t\tsata@a0000 {\n" "> -\t\t\t\tnr-ports = <2>;\n" "> -\t\t\t\tstatus = \"okay\";\n" "> -\t\t\t};\n" "> -\n" - "> -\t\t\tserial at 12000 {\n" + "> -\t\t\tserial@12000 {\n" "> -\t\t\t\tstatus = \"okay\";\n" "> -\t\t\t};\n" "> -\n" "> -\t\t\tmdio {\n" - "> -\t\t\t\tphy0: ethernet-phy at 0 { /* Marvell 88E1318 */\n" + "> -\t\t\t\tphy0: ethernet-phy@0 { /* Marvell 88E1318 */\n" "> -\t\t\t\t\treg = <0>;\n" "> -\t\t\t\t};\n" "> -\n" - "> -\t\t\t\tphy1: ethernet-phy at 1 { /* Marvell 88E1318 */\n" + "> -\t\t\t\tphy1: ethernet-phy@1 { /* Marvell 88E1318 */\n" "> -\t\t\t\t\treg = <1>;\n" "> -\t\t\t\t};\n" "> -\t\t\t};\n" "> -\n" - "> -\t\t\tethernet at 70000 {\n" + "> -\t\t\tethernet@70000 {\n" "> -\t\t\t\tstatus = \"okay\";\n" "> -\t\t\t\tphy = <&phy0>;\n" "> -\t\t\t\tphy-mode = \"rgmii-id\";\n" "> -\t\t\t};\n" "> -\n" - "> -\t\t\tethernet at 74000 {\n" + "> -\t\t\tethernet@74000 {\n" "> -\t\t\t\tstatus = \"okay\";\n" "> -\t\t\t\tphy = <&phy1>;\n" "> -\t\t\t\tphy-mode = \"rgmii-id\";\n" "> -\t\t\t};\n" "> -\n" "> -\t\t\t/* Front USB 2.0 port */\n" - "> -\t\t\tusb at 50000 {\n" + "> -\t\t\tusb@50000 {\n" "> -\t\t\t\tstatus = \"okay\";\n" "> -\t\t\t};\n" "> -\n" - "> \t\t\ti2c at 11000 {\n" + "> \t\t\ti2c@11000 {\n" "> \t\t\t\tcompatible = \"marvell,mv64xxx-i2c\";\n" "> \t\t\t\tclock-frequency = <400000>;\n" "> \t\t\t\tstatus = \"okay\";\n" "> \n" - "> -\t\t\t\tisl12057: isl12057 at 68 {\n" + "> -\t\t\t\tisl12057: isl12057@68 {\n" "> -\t\t\t\t\tcompatible = \"isil,isl12057\";\n" "> -\t\t\t\t\treg = <0x68>;\n" "> -\t\t\t\t\tisil,irq2-can-wakeup-machine;\n" @@ -82,57 +95,57 @@ "> -\n" "> \t\t\t\t/* Controller for rear fan #1 of 3 (Protechnic\n" "> \t\t\t\t * MGT4012XB-O20, 8000RPM) near eSATA port */\n" - "> \t\t\t\tg762_fan1: g762 at 3e {\n" + "> \t\t\t\tg762_fan1: g762@3e {\n" "> @@ -178,6 +135,49 @@\n" "> \t\t\t\t\tcompatible = \"gmt,g751\";\n" "> \t\t\t\t\treg = <0x4c>;\n" "> \t\t\t\t};\n" "> +\n" - "> +\t\t\t\tisl12057: isl12057 at 68 {\n" + "> +\t\t\t\tisl12057: isl12057@68 {\n" "> +\t\t\t\t\tcompatible = \"isil,isl12057\";\n" "> +\t\t\t\t\treg = <0x68>;\n" "> +\t\t\t\t\tisil,irq2-can-wakeup-machine;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tserial at 12000 {\n" + "> +\t\t\tserial@12000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" "> +\t\t\t/* Front USB 2.0 port */\n" - "> +\t\t\tusb at 50000 {\n" + "> +\t\t\tusb@50000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" "> +\t\t\tmdio {\n" - "> +\t\t\t\tphy0: ethernet-phy at 0 { /* Marvell 88E1318 */\n" + "> +\t\t\t\tphy0: ethernet-phy@0 { /* Marvell 88E1318 */\n" "> +\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tphy1: ethernet-phy at 1 { /* Marvell 88E1318 */\n" + "> +\t\t\t\tphy1: ethernet-phy@1 { /* Marvell 88E1318 */\n" "> +\t\t\t\t\treg = <1>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tethernet at 70000 {\n" + "> +\t\t\tethernet@70000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t\tphy = <&phy0>;\n" "> +\t\t\t\tphy-mode = \"rgmii-id\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tethernet at 74000 {\n" + "> +\t\t\tethernet@74000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t\tphy = <&phy1>;\n" "> +\t\t\t\tphy-mode = \"rgmii-id\";\n" "> +\t\t\t};\n" "> +\n" "> +\t\t\t/* Two rear eSATA ports */\n" - "> +\t\t\tsata at a0000 {\n" + "> +\t\t\tsata@a0000 {\n" "> +\t\t\t\tnr-ports = <2>;\n" "> +\t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> \n" - "> \t\t\tnand at d0000 {\n" + "> \t\t\tnand@d0000 {\n" "> -- \n" "> 2.5.3\n" ">\n" @@ -143,4 +156,4 @@ "development, consulting, training and support.\n" http://free-electrons.com -97024168dd88d683b8458c0a6114140658f766d3240b6337ece46337289df0ff +15a8c4d15a729d8a0c84b869a05df402ea30815bf5ad9c752e94db2bb29ec73a
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.