diff for duplicates of <2044972.NvctqPqDPo@bender> diff --git a/a/1.txt b/N1/1.txt index a30b820..3147b91 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -59,7 +59,7 @@ index 0000000..db92f55 + +Example: + -+ dsa at 0 { ++ dsa@0 { + compatible = "marvell,dsa"; + #address-cells = <1>; + #size-cells = <0>; @@ -68,39 +68,39 @@ index 0000000..db92f55 + dsa,ethernet = <ðernet0>; + dsa,mii-bus = <&mii_bus0>; + -+ switch at 0 { ++ switch@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <16 0>; /* MDIO address 16, switch 0 in tree */ + -+ port at 0 { ++ port@0 { + reg = <0>; + label = "lan1"; + }; + -+ port at 1 { ++ port@1 { + reg = <1>; + label = "lan2"; + }; + -+ port at 5 { ++ port@5 { + reg = <5>; + label = "cpu"; + }; + -+ switch0uplink: port at 6 { ++ switch0uplink: port@6 { + reg = <6>; + label = "dsa"; + link = <&switch1uplink>; + }; + }; + -+ switch at 1 { ++ switch@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <17 1>; /* MDIO address 17, switch 1 in tree */ + -+ switch1uplink: port at 0 { ++ switch1uplink: port@0 { + reg = <0>; + label = "dsa"; + link = <&switch0uplink>; diff --git a/a/content_digest b/N1/content_digest index fc3cb7b..ecafa2b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,17 @@ - "From\0florian@openwrt.org (Florian Fainelli)\0" + "From\0Florian Fainelli <florian@openwrt.org>\0" "Subject\0[PATCH net-next] dsa: add device tree bindings to register DSA switches\0" "Date\0Fri, 22 Mar 2013 21:50:50 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0davem@davemloft.net" + devicetree-discuss@lists.ozlabs.org + rob.herring@calxeda.com + grant.likely@secretlab.ca + thomas.petazzoni@free-electrons.com + gregory.clement@free-electrons.com + jason@lakedaemon.net + Lennert Buytenhek <buytenh@wantstofly.org> + netdev@vger.kernel.org + Andrew Lunn <andrew@lunn.ch> + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "This patch adds support for registering DSA switches using Device Tree\n" @@ -65,7 +75,7 @@ "+\n" "+Example:\n" "+\n" - "+\tdsa at 0 {\n" + "+\tdsa@0 {\n" "+\t\tcompatible = \"marvell,dsa\";\n" "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" @@ -74,39 +84,39 @@ "+\t\tdsa,ethernet = <ðernet0>;\n" "+\t\tdsa,mii-bus = <&mii_bus0>;\n" "+\n" - "+\t\tswitch at 0 {\n" + "+\t\tswitch@0 {\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <0>;\n" "+\t\t\treg = <16 0>;\t/* MDIO address 16, switch 0 in tree */\n" "+\n" - "+\t\t\tport at 0 {\n" + "+\t\t\tport@0 {\n" "+\t\t\t\treg = <0>;\n" "+\t\t\t\tlabel = \"lan1\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tport at 1 {\n" + "+\t\t\tport@1 {\n" "+\t\t\t\treg = <1>;\n" "+\t\t\t\tlabel = \"lan2\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tport at 5 {\n" + "+\t\t\tport@5 {\n" "+\t\t\t\treg = <5>;\n" "+\t\t\t\tlabel = \"cpu\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tswitch0uplink: port at 6 {\n" + "+\t\t\tswitch0uplink: port@6 {\n" "+\t\t\t\treg = <6>;\n" "+\t\t\t\tlabel = \"dsa\";\n" "+\t\t\t\tlink = <&switch1uplink>;\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\tswitch at 1 {\n" + "+\t\tswitch@1 {\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <0>;\n" "+\t\t\treg = <17 1>;\t/* MDIO address 17, switch 1 in tree */\n" "+\n" - "+\t\t\tswitch1uplink: port at 0 {\n" + "+\t\t\tswitch1uplink: port@0 {\n" "+\t\t\t\treg = <0>;\n" "+\t\t\t\tlabel = \"dsa\";\n" "+\t\t\t\tlink = <&switch0uplink>;\n" @@ -425,4 +435,4 @@ "-- \n" 1.7.10.4 -b8ffe88259e319aa3740ee9050e51a2529eabf49db505bb295b6157f7b1c3129 +38e79714a3020495928adeabe2f824aed4944be041fa220512dea8c07d50629d
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.