diff for duplicates of <502252A6.4090409@codethink.co.uk> diff --git a/a/1.txt b/N1/1.txt index 502b1a9..7df71a8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,12 +15,12 @@ the below: The SMI / PHY stuff should look very similar, so I'm happy with something like: -mdio at 2000 { +mdio@2000 { #address-cells = <1>; #size-cells = <1>; device_type = "mdio"; compatible = "marvell,mv643xx-mdio"; - phy0: ethernet-phy at 0 { + phy0: ethernet-phy@0 { device_type = "ethernet-phy"; compatible = "marvell,whatever"; interrupts = <76>; @@ -28,7 +28,7 @@ mdio at 2000 { reg = <0 32>; // Auto probed phy addr }; - phy1: ethernet-phy at 3 { + phy1: ethernet-phy@3 { device_type = "ethernet-phy"; compatible = "marvell,whatever"; interrupts = <77>; @@ -69,7 +69,7 @@ interrupts, MACs, and PHYs. This is clean in that it doesnt require multiply instantiating a driver three times over the same address space. -ethernet at 2400 { +ethernet@2400 { compatible = "marvell,mv643xx-eth"; reg = <0x2400 0x1c00> interrupt_parent = <&mpic>; @@ -78,7 +78,7 @@ ethernet at 2400 { phys = <&phy0>, <&phy1>, <&phy2>; }; -ethernet at 6400 { +ethernet@6400 { compatible = "marvell,mv643xx-eth"; reg = <0x6400 0x1c00> interrupt_parent = <&mpic>; @@ -98,40 +98,40 @@ all the work for some sort of lightweight ethernet device, one per port. This can never be done cleanly since the port address ranges overlap: -pseudo_eth at 2400 { +pseudo_eth@2400 { #address-cells = <1>; #size-cells = <0>; compatible = "marvell,mv643xx-shared-eth" reg = <0x2400 0x1c00>; - ethernet at 0 { + ethernet@0 { compatible = "marvell,mv643xx-port"; interrupts = <4>; interrupt_parent = <&mpic>; phy = <&phy0>; }; - ethernet at 1 { + ethernet@1 { compatible = "marvell,mv643xx-port"; interrupts = <5>; interrupt_parent = <&mpic>; phy = <&phy1>; }; - ethernet at 2 { + ethernet@2 { compatible = "marvell,mv643xx-port"; interrupts = <6>; interrupt_parent = <&mpic>; phy = <&phy2>; }; } -pseudo_eth at 6400 { +pseudo_eth@6400 { #address-cells = <1>; #size-cells = <0>; compatible = "marvell,mv643xx-shared-eth" reg = <0x6400 0x1c00>; - ethernet at 0 { + ethernet@0 { compatible = "marvell,mv643xx-port"; interrupts = <4>; interrupt_parent = <&mpic>; diff --git a/a/content_digest b/N1/content_digest index 8549991..915806f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,10 +2,16 @@ "ref\020120807.162923.34400427265666163.davem@davemloft.net\0" "ref\0201208080816.29218.arnd@arndb.de\0" "ref\050223428.6030506@codethink.co.uk\0" - "From\0ian.molton@codethink.co.uk (Ian Molton)\0" - "Subject\0[PATCH v3 0/7] mv643xx.c: Add basic device tree support.\0" + "From\0Ian Molton <ian.molton@codethink.co.uk>\0" + "Subject\0Re: [PATCH v3 0/7] mv643xx.c: Add basic device tree support.\0" "Date\0Wed, 08 Aug 2012 12:51:02 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Arnd Bergmann <arnd@arndb.de>\0" + "Cc\0David Miller <davem@davemloft.net>" + linux-arm-kernel@lists.infradead.org + andrew@lunn.ch + thomas.petazzoni@free-electrons.com + ben.dooks@codethink.co.uk + " netdev@vger.kernel.org\0" "\00:1\0" "b\0" "On 08/08/12 10:40, Ian Molton wrote:\n" @@ -25,12 +31,12 @@ "The SMI / PHY stuff should look very similar, so I'm happy with something\n" "like:\n" "\n" - "mdio at 2000 {\n" + "mdio@2000 {\n" " #address-cells = <1>;\n" " #size-cells = <1>;\n" " device_type = \"mdio\";\n" " compatible = \"marvell,mv643xx-mdio\";\n" - " phy0: ethernet-phy at 0 {\n" + " phy0: ethernet-phy@0 {\n" " device_type = \"ethernet-phy\";\n" " compatible = \"marvell,whatever\";\n" " interrupts = <76>;\n" @@ -38,7 +44,7 @@ " reg = <0 32>; // Auto probed phy addr\n" " };\n" "\n" - " phy1: ethernet-phy at 3 {\n" + " phy1: ethernet-phy@3 {\n" " device_type = \"ethernet-phy\";\n" " compatible = \"marvell,whatever\";\n" " interrupts = <77>;\n" @@ -79,7 +85,7 @@ "multiply instantiating a driver three times over the same address\n" "space.\n" "\n" - "ethernet at 2400 {\n" + "ethernet@2400 {\n" " compatible = \"marvell,mv643xx-eth\";\n" " reg = <0x2400 0x1c00>\n" " interrupt_parent = <&mpic>;\n" @@ -88,7 +94,7 @@ " phys = <&phy0>, <&phy1>, <&phy2>;\n" "};\n" "\n" - "ethernet at 6400 {\n" + "ethernet@6400 {\n" " compatible = \"marvell,mv643xx-eth\";\n" " reg = <0x6400 0x1c00>\n" " interrupt_parent = <&mpic>;\n" @@ -108,40 +114,40 @@ "port. This can never be done cleanly since the port address ranges\n" "overlap:\n" "\n" - "pseudo_eth at 2400 {\n" + "pseudo_eth@2400 {\n" " #address-cells = <1>;\n" " #size-cells = <0>;\n" " compatible = \"marvell,mv643xx-shared-eth\"\n" " reg = <0x2400 0x1c00>;\n" "\n" - " ethernet at 0 {\n" + " ethernet@0 {\n" " compatible = \"marvell,mv643xx-port\";\n" " interrupts = <4>;\n" " interrupt_parent = <&mpic>;\n" " phy = <&phy0>;\n" " };\n" "\n" - " ethernet at 1 {\n" + " ethernet@1 {\n" " compatible = \"marvell,mv643xx-port\";\n" " interrupts = <5>;\n" " interrupt_parent = <&mpic>;\n" " phy = <&phy1>;\n" " };\n" "\n" - " ethernet at 2 {\n" + " ethernet@2 {\n" " compatible = \"marvell,mv643xx-port\";\n" " interrupts = <6>;\n" " interrupt_parent = <&mpic>;\n" " phy = <&phy2>;\n" " };\n" "}\n" - "pseudo_eth at 6400 {\n" + "pseudo_eth@6400 {\n" " #address-cells = <1>;\n" " #size-cells = <0>;\n" " compatible = \"marvell,mv643xx-shared-eth\"\n" " reg = <0x6400 0x1c00>;\n" "\n" - " ethernet at 0 {\n" + " ethernet@0 {\n" " compatible = \"marvell,mv643xx-port\";\n" " interrupts = <4>;\n" " interrupt_parent = <&mpic>;\n" @@ -153,4 +159,4 @@ "\n" -Ian -eace604a6c0a9af5a78ec0d3753c2e0eec7ddd8e7b933cefde94a0e98393a4b1 +81a597f7f07334c03f7750851f54181e1f01534f41e97d9c0f9a48d73beebd5d
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.