diff for duplicates of <53C92D70.6050604@atmel.com> diff --git a/a/1.txt b/N1/1.txt index a298176..0eb8712 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,12 +34,12 @@ Thanks, bye, > +++ b/arch/arm/boot/dts/sama5d3xcm.dtsi > @@ -34,6 +34,36 @@ > -> macb0: ethernet at f0028000 { +> macb0: ethernet@f0028000 { > phy-mode = "rgmii"; > + #address-cells = <1>; > + #size-cells = <0>; > + -> + ethernet-phy at 1 { +> + ethernet-phy@1 { > + reg = <0x1>; > + interrupt-parent = <&pioB>; > + interrupts = <25 IRQ_TYPE_EDGE_FALLING>; @@ -53,7 +53,7 @@ Thanks, bye, > + rxd3-skew-ps = <400>; > + }; > + -> + ethernet-phy at 7 { +> + ethernet-phy@7 { > + reg = <0x7>; > + interrupt-parent = <&pioB>; > + interrupts = <25 IRQ_TYPE_EDGE_FALLING>; @@ -68,7 +68,7 @@ Thanks, bye, > + }; > }; > -> pmc: pmc at fffffc00 { +> pmc: pmc@fffffc00 { > diff --git a/a/content_digest b/N1/content_digest index 11b98ab..9afd753 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,23 @@ "ref\01405022394-8311-1-git-send-email-boris.brezillon@free-electrons.com\0" "ref\01405022394-8311-2-git-send-email-boris.brezillon@free-electrons.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH v3 1/2] ARM: at91/dt: describe rgmii ethernet phy connected to sama5d3xek boards\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH v3 1/2] ARM: at91/dt: describe rgmii ethernet phy connected to sama5d3xek boards\0" "Date\0Fri, 18 Jul 2014 16:21:36 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Florian Fainelli <f.fainelli@gmail.com>\0" + "Cc\0Boris BREZILLON <boris.brezillon@free-electrons.com>" + Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> + Alexandre Belloni <alexandre.belloni@free-electrons.com> + Andrew Victor <linux@maxim.org.za> + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + 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> + devicetree@vger.kernel.org + David S. Miller <davem@davemloft.net> + " netdev@vger.kernel.org\0" "\00:1\0" "b\0" "On 10/07/2014 21:59, Boris BREZILLON :\n" @@ -42,12 +56,12 @@ "> +++ b/arch/arm/boot/dts/sama5d3xcm.dtsi\n" "> @@ -34,6 +34,36 @@\n" "> \n" - "> \t\t\tmacb0: ethernet at f0028000 {\n" + "> \t\t\tmacb0: ethernet@f0028000 {\n" "> \t\t\t\tphy-mode = \"rgmii\";\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" "> +\n" - "> +\t\t\t\tethernet-phy at 1 {\n" + "> +\t\t\t\tethernet-phy@1 {\n" "> +\t\t\t\t\treg = <0x1>;\n" "> +\t\t\t\t\tinterrupt-parent = <&pioB>;\n" "> +\t\t\t\t\tinterrupts = <25 IRQ_TYPE_EDGE_FALLING>;\n" @@ -61,7 +75,7 @@ "> +\t\t\t\t\trxd3-skew-ps = <400>;\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tethernet-phy at 7 {\n" + "> +\t\t\t\tethernet-phy@7 {\n" "> +\t\t\t\t\treg = <0x7>;\n" "> +\t\t\t\t\tinterrupt-parent = <&pioB>;\n" "> +\t\t\t\t\tinterrupts = <25 IRQ_TYPE_EDGE_FALLING>;\n" @@ -76,11 +90,11 @@ "> +\t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\tpmc: pmc at fffffc00 {\n" + "> \t\t\tpmc: pmc@fffffc00 {\n" "> \n" "\n" "\n" "-- \n" Nicolas Ferre -7bff67341b7d47bf6e67acc4319a212349785562aa68d7802a23661b1408a1f4 +d907c193e04b9740ef5df1ed091c958a49d660f57b0c93fae8fc76c0e30e4a27
diff --git a/a/1.txt b/N2/1.txt index a298176..0eb8712 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -34,12 +34,12 @@ Thanks, bye, > +++ b/arch/arm/boot/dts/sama5d3xcm.dtsi > @@ -34,6 +34,36 @@ > -> macb0: ethernet at f0028000 { +> macb0: ethernet@f0028000 { > phy-mode = "rgmii"; > + #address-cells = <1>; > + #size-cells = <0>; > + -> + ethernet-phy at 1 { +> + ethernet-phy@1 { > + reg = <0x1>; > + interrupt-parent = <&pioB>; > + interrupts = <25 IRQ_TYPE_EDGE_FALLING>; @@ -53,7 +53,7 @@ Thanks, bye, > + rxd3-skew-ps = <400>; > + }; > + -> + ethernet-phy at 7 { +> + ethernet-phy@7 { > + reg = <0x7>; > + interrupt-parent = <&pioB>; > + interrupts = <25 IRQ_TYPE_EDGE_FALLING>; @@ -68,7 +68,7 @@ Thanks, bye, > + }; > }; > -> pmc: pmc at fffffc00 { +> pmc: pmc@fffffc00 { > diff --git a/a/content_digest b/N2/content_digest index 11b98ab..8c08e4e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,23 @@ "ref\01405022394-8311-1-git-send-email-boris.brezillon@free-electrons.com\0" "ref\01405022394-8311-2-git-send-email-boris.brezillon@free-electrons.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH v3 1/2] ARM: at91/dt: describe rgmii ethernet phy connected to sama5d3xek boards\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH v3 1/2] ARM: at91/dt: describe rgmii ethernet phy connected to sama5d3xek boards\0" "Date\0Fri, 18 Jul 2014 16:21:36 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Florian Fainelli <f.fainelli@gmail.com>\0" + "Cc\0Boris BREZILLON <boris.brezillon@free-electrons.com>" + Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> + Alexandre Belloni <alexandre.belloni@free-electrons.com> + Andrew Victor <linux@maxim.org.za> + <linux-arm-kernel@lists.infradead.org> + <linux-kernel@vger.kernel.org> + 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> + <devicetree@vger.kernel.org> + David S. Miller <davem@davemloft.net> + " <netdev@vger.kernel.org>\0" "\00:1\0" "b\0" "On 10/07/2014 21:59, Boris BREZILLON :\n" @@ -42,12 +56,12 @@ "> +++ b/arch/arm/boot/dts/sama5d3xcm.dtsi\n" "> @@ -34,6 +34,36 @@\n" "> \n" - "> \t\t\tmacb0: ethernet at f0028000 {\n" + "> \t\t\tmacb0: ethernet@f0028000 {\n" "> \t\t\t\tphy-mode = \"rgmii\";\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" "> +\n" - "> +\t\t\t\tethernet-phy at 1 {\n" + "> +\t\t\t\tethernet-phy@1 {\n" "> +\t\t\t\t\treg = <0x1>;\n" "> +\t\t\t\t\tinterrupt-parent = <&pioB>;\n" "> +\t\t\t\t\tinterrupts = <25 IRQ_TYPE_EDGE_FALLING>;\n" @@ -61,7 +75,7 @@ "> +\t\t\t\t\trxd3-skew-ps = <400>;\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tethernet-phy at 7 {\n" + "> +\t\t\t\tethernet-phy@7 {\n" "> +\t\t\t\t\treg = <0x7>;\n" "> +\t\t\t\t\tinterrupt-parent = <&pioB>;\n" "> +\t\t\t\t\tinterrupts = <25 IRQ_TYPE_EDGE_FALLING>;\n" @@ -76,11 +90,11 @@ "> +\t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\tpmc: pmc at fffffc00 {\n" + "> \t\t\tpmc: pmc@fffffc00 {\n" "> \n" "\n" "\n" "-- \n" Nicolas Ferre -7bff67341b7d47bf6e67acc4319a212349785562aa68d7802a23661b1408a1f4 +e6c0056c04bffc7560418f7d19507d1ccefbfd84bcf7678d343829673d53aba8
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.