diff for duplicates of <521C5C85.2060007@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 3873e92..c951ff0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,19 +17,19 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi > @@ -81,6 +81,14 @@ > -> macb1: ethernet at f802c000 { +> macb1: ethernet@f802c000 { > phy-mode = "rmii"; > + > + #address-cells = <1>; > + #size-cells = <0>; -> + phy0: ethernet-phy at 1 { +> + phy0: ethernet-phy@1 { > + interrupt-parent = <&pioE>; > + interrupts = <30 IRQ_TYPE_EDGE_FALLING>; > + reg = <1>; > + }; > }; > -> pinctrl at fffff200 { +> pinctrl@fffff200 { > diff --git a/a/content_digest b/N1/content_digest index f9d3bb5..9e4c5c0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,19 @@ "ref\01377589007-3684-1-git-send-email-b.brezillon@overkiz.com\0" "ref\01377589142-3758-1-git-send-email-b.brezillon@overkiz.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH v3 2/2] ARM: at91/dt: define phy available on sama5d3 mother board\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH v3 2/2] ARM: at91/dt: define phy available on sama5d3 mother board\0" "Date\0Tue, 27 Aug 2013 10:00:05 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Boris BREZILLON <b.brezillon@overkiz.com>\0" + "Cc\0Rob Herring <rob.herring@calxeda.com>" + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Stephen Warren <swarren@wwwdotorg.org> + Ian Campbell <ian.campbell@citrix.com> + Russell King <linux@arm.linux.org.uk> + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + " netdev@vger.kernel.org\0" "\00:1\0" "b\0" "On 27/08/2013 09:39, Boris BREZILLON :\n" @@ -25,23 +35,23 @@ "> +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi\n" "> @@ -81,6 +81,14 @@\n" ">\n" - "> \t\t\tmacb1: ethernet at f802c000 {\n" + "> \t\t\tmacb1: ethernet@f802c000 {\n" "> \t\t\t\tphy-mode = \"rmii\";\n" "> +\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" - "> +\t\t\t\tphy0: ethernet-phy at 1 {\n" + "> +\t\t\t\tphy0: ethernet-phy@1 {\n" "> +\t\t\t\t\tinterrupt-parent = <&pioE>;\n" "> +\t\t\t\t\tinterrupts = <30 IRQ_TYPE_EDGE_FALLING>;\n" "> +\t\t\t\t\treg = <1>;\n" "> +\t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> \t\t\tpinctrl at fffff200 {\n" + "> \t\t\tpinctrl@fffff200 {\n" ">\n" "\n" "\n" "-- \n" Nicolas Ferre -978b6c28383e52313d6c24f5da560ac43583f7d3e7e3369e609dfb3c508b897a +8bbee7b7178ce6ba9d778c44ba5bdc47a42bf4b291a63fa27a9fc4cf9989ac21
diff --git a/a/1.txt b/N2/1.txt index 3873e92..c951ff0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -17,19 +17,19 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi > @@ -81,6 +81,14 @@ > -> macb1: ethernet at f802c000 { +> macb1: ethernet@f802c000 { > phy-mode = "rmii"; > + > + #address-cells = <1>; > + #size-cells = <0>; -> + phy0: ethernet-phy at 1 { +> + phy0: ethernet-phy@1 { > + interrupt-parent = <&pioE>; > + interrupts = <30 IRQ_TYPE_EDGE_FALLING>; > + reg = <1>; > + }; > }; > -> pinctrl at fffff200 { +> pinctrl@fffff200 { > diff --git a/a/content_digest b/N2/content_digest index f9d3bb5..15073da 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,19 @@ "ref\01377589007-3684-1-git-send-email-b.brezillon@overkiz.com\0" "ref\01377589142-3758-1-git-send-email-b.brezillon@overkiz.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH v3 2/2] ARM: at91/dt: define phy available on sama5d3 mother board\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH v3 2/2] ARM: at91/dt: define phy available on sama5d3 mother board\0" "Date\0Tue, 27 Aug 2013 10:00:05 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Boris BREZILLON <b.brezillon@overkiz.com>\0" + "Cc\0Rob Herring <rob.herring@calxeda.com>" + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Stephen Warren <swarren@wwwdotorg.org> + Ian Campbell <ian.campbell@citrix.com> + Russell King <linux@arm.linux.org.uk> + <devicetree@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + <linux-kernel@vger.kernel.org> + " <netdev@vger.kernel.org>\0" "\00:1\0" "b\0" "On 27/08/2013 09:39, Boris BREZILLON :\n" @@ -25,23 +35,23 @@ "> +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi\n" "> @@ -81,6 +81,14 @@\n" ">\n" - "> \t\t\tmacb1: ethernet at f802c000 {\n" + "> \t\t\tmacb1: ethernet@f802c000 {\n" "> \t\t\t\tphy-mode = \"rmii\";\n" "> +\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" - "> +\t\t\t\tphy0: ethernet-phy at 1 {\n" + "> +\t\t\t\tphy0: ethernet-phy@1 {\n" "> +\t\t\t\t\tinterrupt-parent = <&pioE>;\n" "> +\t\t\t\t\tinterrupts = <30 IRQ_TYPE_EDGE_FALLING>;\n" "> +\t\t\t\t\treg = <1>;\n" "> +\t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> \t\t\tpinctrl at fffff200 {\n" + "> \t\t\tpinctrl@fffff200 {\n" ">\n" "\n" "\n" "-- \n" Nicolas Ferre -978b6c28383e52313d6c24f5da560ac43583f7d3e7e3369e609dfb3c508b897a +73035233ecb035dd698c5bbf4ba1b54699542c6b71485429b22894d67460df5f
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.