diff for duplicates of <87ppq5flnb.fsf@natisbad.org> diff --git a/a/1.txt b/N1/1.txt index e454232..130ee01 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -130,19 +130,19 @@ index 0000000..7ea9fea + status = "okay"; + + /* Connected to first Marvell 88SE9170 SATA controller */ -+ pcie at 1,0 { ++ pcie@1,0 { + /* Port 0, Lane 0 */ + status = "okay"; + }; + + /* Connected to second Marvell 88SE9170 SATA controller */ -+ pcie at 2,0 { ++ pcie@2,0 { + /* Port 0, Lane 1 */ + status = "okay"; + }; + + /* Connected to Fresco Logic FL1009 USB 3.0 controller */ -+ pcie at 5,0 { ++ pcie@5,0 { + /* Port 1, Lane 0 */ + status = "okay"; + }; @@ -231,48 +231,48 @@ index 0000000..7ea9fea + }; + }; + -+ serial at 12000 { ++ serial@12000 { + clocks = <&coreclk 0>; + status = "okay"; + }; + + mdio { -+ phy0: ethernet-phy at 0 { ++ phy0: ethernet-phy@0 { + compatible = "marvell,88e1318s"; + reg = <0>; + }; + -+ phy1: ethernet-phy at 1 { ++ phy1: ethernet-phy@1 { + compatible = "marvell,88e1318s"; + 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,mv78230-i2c"; + clock-frequency = <400000>; + status = "okay"; + + /* Controller for rear fan #1 of 3 (Protechnic + * MGT4012XB-O20, 8000RPM) near eSATA port */ -+ g762_fan1: g762 at 3e { ++ g762_fan1: g762@3e { + compatible = "gmt,g762"; + reg = <0x3e>; + clocks = <&g762_clk>; /* input clock */ @@ -282,7 +282,7 @@ index 0000000..7ea9fea + }; + + /* Controller for rear (center) fan #2 of 3 */ -+ g762_fan2: g762 at 48 { ++ g762_fan2: g762@48 { + compatible = "gmt,g762"; + reg = <0x48>; + clocks = <&g762_clk>; /* input clock */ @@ -292,7 +292,7 @@ index 0000000..7ea9fea + }; + + /* Controller for rear fan #3 of 3 */ -+ g762_fan3: g762 at 49 { ++ g762_fan3: g762@49 { + compatible = "gmt,g762"; + reg = <0x49>; + clocks = <&g762_clk>; /* input clock */ @@ -302,7 +302,7 @@ index 0000000..7ea9fea + }; + + /* Temperature sensor */ -+ g751: g751 at 4c { ++ g751: g751@4c { + compatible = "gmt,g751"; + reg = <0x4c>; + }; diff --git a/a/content_digest b/N1/content_digest index 360f1c6..9c947d5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,21 @@ "From\0arno@natisbad.org (Arnaud Ebalard)\0" "Subject\0[PATCHv2] ARM: mvebu: Add Netgear ReadyNAS 2120 board\0" "Date\0Tue, 12 Nov 2013 20:46:48 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jason Cooper <jason@lakedaemon.net>" + Andrew Lunn <andrew@lunn.ch> + Gregory Clement <gregory.clement@free-electrons.com> + Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> + Ezequiel Garcia <ezequiel.garcia@free-electrons.com> + " Thomas Petazzoni <thomas.petazzoni@free-electrons.com>\0" + "Cc\0Mark Rutland <mark.rutland@arm.com>" + devicetree@vger.kernel.org + Russell King <linux@arm.linux.org.uk> + Pawel Moll <pawel.moll@arm.com> + Stephen Warren <swarren@wwwdotorg.org> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Rob Herring <rob.herring@calxeda.com> + Guenter Roeck <linux@roeck-us.net> + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "\n" @@ -136,19 +150,19 @@ "+\t\t\tstatus = \"okay\";\n" "+\n" "+\t\t\t/* Connected to first Marvell 88SE9170 SATA controller */\n" - "+\t\t\tpcie at 1,0 {\n" + "+\t\t\tpcie@1,0 {\n" "+\t\t\t\t/* Port 0, Lane 0 */\n" "+\t\t\t\tstatus = \"okay\";\n" "+\t\t\t};\n" "+\n" "+\t\t\t/* Connected to second Marvell 88SE9170 SATA controller */\n" - "+\t\t\tpcie at 2,0 {\n" + "+\t\t\tpcie@2,0 {\n" "+\t\t\t\t/* Port 0, Lane 1 */\n" "+\t\t\t\tstatus = \"okay\";\n" "+\t\t\t};\n" "+\n" "+\t\t\t/* Connected to Fresco Logic FL1009 USB 3.0 controller */\n" - "+\t\t\tpcie at 5,0 {\n" + "+\t\t\tpcie@5,0 {\n" "+\t\t\t\t/* Port 1, Lane 0 */\n" "+\t\t\t\tstatus = \"okay\";\n" "+\t\t\t};\n" @@ -237,48 +251,48 @@ "+\t\t\t\t};\n" "+\t\t\t};\n" "+\n" - "+\t\t\tserial at 12000 {\n" + "+\t\t\tserial@12000 {\n" "+\t\t\t\tclocks = <&coreclk 0>;\n" "+\t\t\t\tstatus = \"okay\";\n" "+\t\t\t};\n" "+\n" "+\t\t\tmdio {\n" - "+\t\t\t\tphy0: ethernet-phy at 0 {\n" + "+\t\t\t\tphy0: ethernet-phy@0 {\n" "+\t\t\t\t\tcompatible = \"marvell,88e1318s\";\n" "+\t\t\t\t\treg = <0>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tphy1: ethernet-phy at 1 {\n" + "+\t\t\t\tphy1: ethernet-phy@1 {\n" "+\t\t\t\t\tcompatible = \"marvell,88e1318s\";\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,mv78230-i2c\";\n" "+\t\t\t\tclock-frequency = <400000>;\n" "+\t\t\t\tstatus = \"okay\";\n" "+\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" "+\t\t\t\t\tcompatible = \"gmt,g762\";\n" "+\t\t\t\t\treg = <0x3e>;\n" "+\t\t\t\t\tclocks = <&g762_clk>; /* input clock */\n" @@ -288,7 +302,7 @@ "+\t\t\t\t};\n" "+\n" "+\t\t\t\t/* Controller for rear (center) fan #2 of 3 */\n" - "+\t\t\t\tg762_fan2: g762 at 48 {\n" + "+\t\t\t\tg762_fan2: g762@48 {\n" "+\t\t\t\t\tcompatible = \"gmt,g762\";\n" "+\t\t\t\t\treg = <0x48>;\n" "+\t\t\t\t\tclocks = <&g762_clk>; /* input clock */\n" @@ -298,7 +312,7 @@ "+\t\t\t\t};\n" "+\n" "+\t\t\t\t/* Controller for rear fan #3 of 3 */\n" - "+\t\t\t\tg762_fan3: g762 at 49 {\n" + "+\t\t\t\tg762_fan3: g762@49 {\n" "+\t\t\t\t\tcompatible = \"gmt,g762\";\n" "+\t\t\t\t\treg = <0x49>;\n" "+\t\t\t\t\tclocks = <&g762_clk>; /* input clock */\n" @@ -308,7 +322,7 @@ "+\t\t\t\t};\n" "+\n" "+\t\t\t\t/* Temperature sensor */\n" - "+\t\t\t\tg751: g751 at 4c {\n" + "+\t\t\t\tg751: g751@4c {\n" "+\t\t\t\t\tcompatible = \"gmt,g751\";\n" "+\t\t\t\t\treg = <0x4c>;\n" "+\t\t\t\t};\n" @@ -389,4 +403,4 @@ "-- \n" 1.8.4.rc3 -6ad7a8889245006e927a9a9e64d805728cb9d8a8ffed7329a38c5148ee0d5d5c +7fe948754c716a2c2092e14d603316fa89dfe325622dd206b76f5d27db752f12
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.