diff for duplicates of <510E51FF.8090005@ti.com> diff --git a/a/1.txt b/N1/1.txt index dc5d309..1a19a15 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,11 +5,11 @@ On 1/28/2013 7:17 PM, Prabhakar Lad wrote: > providing interrupt details and local mac address of eth0. > > Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com> -> Cc: linux-arm-kernel at lists.infradead.org -> Cc: linux-kernel at vger.kernel.org -> Cc: davinci-linux-open-source at linux.davincidsp.com -> Cc: netdev at vger.kernel.org -> Cc: devicetree-discuss at lists.ozlabs.org +> Cc: linux-arm-kernel@lists.infradead.org +> Cc: linux-kernel@vger.kernel.org +> Cc: davinci-linux-open-source@linux.davincidsp.com +> Cc: netdev@vger.kernel.org +> Cc: devicetree-discuss@lists.ozlabs.org > Cc: Sekhar Nori <nsekhar@ti.com> > Cc: Heiko Schocher <hs@denx.de> > --- @@ -22,16 +22,16 @@ On 1/28/2013 7:17 PM, Prabhakar Lad wrote: > --- a/arch/arm/boot/dts/da850-evm.dts > +++ b/arch/arm/boot/dts/da850-evm.dts > @@ -30,6 +30,11 @@ -> mdio: davinci_mdio at 1e24000 { +> mdio: davinci_mdio@1e24000 { > status = "okay"; > }; -> + eth0: emac at 1e20000 { +> + eth0: emac@1e20000 { > + status = "okay"; > + pinctrl-names = "default"; > + pinctrl-0 = <&mii_pins>; > + }; > }; -> nand_cs3 at 62000000 { +> nand_cs3@62000000 { > status = "okay"; > diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi > index ba28f2d..76905f3 100644 @@ -71,13 +71,13 @@ it here. > + >; > + }; > }; -> serial0: serial at 1c42000 { +> serial0: serial@1c42000 { > compatible = "ns16550a"; > @@ -88,6 +108,21 @@ > reg = <0x224000 0x1000>; > bus_freq = <2200000>; > }; -> + eth0: emac at 1e20000 { +> + eth0: emac@1e20000 { > + compatible = "ti,davinci-dm6467-emac"; > + reg = <0x220000 0x4000>; > + ti,davinci-ctrl-reg-offset = <0x3000>; diff --git a/a/content_digest b/N1/content_digest index cb39a6e..1b43872 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,17 @@ "ref\01359380879-26306-1-git-send-email-prabhakar.lad@ti.com\0" "ref\01359380879-26306-5-git-send-email-prabhakar.lad@ti.com\0" - "From\0nsekhar@ti.com (Sekhar Nori)\0" - "Subject\0[PATCH v2 4/6] ARM: davinci: da850: add DT node for eth0.\0" + "From\0Sekhar Nori <nsekhar@ti.com>\0" + "Subject\0Re: [PATCH v2 4/6] ARM: davinci: da850: add DT node for eth0.\0" "Date\0Sun, 3 Feb 2013 17:33:11 +0530\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Prabhakar Lad <prabhakar.csengg@gmail.com>\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + davinci-linux-open-source@linux.davincidsp.com + linux-kernel@vger.kernel.org + netdev@vger.kernel.org + devicetree-discuss@lists.ozlabs.org + Heiko Schocher <hs@denx.de> + Lad + " Prabhakar <prabhakar.lad@ti.com>\0" "\00:1\0" "b\0" "On 1/28/2013 7:17 PM, Prabhakar Lad wrote:\n" @@ -13,11 +21,11 @@ "> providing interrupt details and local mac address of eth0.\n" "> \n" "> Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>\n" - "> Cc: linux-arm-kernel at lists.infradead.org\n" - "> Cc: linux-kernel at vger.kernel.org\n" - "> Cc: davinci-linux-open-source at linux.davincidsp.com\n" - "> Cc: netdev at vger.kernel.org\n" - "> Cc: devicetree-discuss at lists.ozlabs.org\n" + "> Cc: linux-arm-kernel@lists.infradead.org\n" + "> Cc: linux-kernel@vger.kernel.org\n" + "> Cc: davinci-linux-open-source@linux.davincidsp.com\n" + "> Cc: netdev@vger.kernel.org\n" + "> Cc: devicetree-discuss@lists.ozlabs.org\n" "> Cc: Sekhar Nori <nsekhar@ti.com>\n" "> Cc: Heiko Schocher <hs@denx.de>\n" "> ---\n" @@ -30,16 +38,16 @@ "> --- a/arch/arm/boot/dts/da850-evm.dts\n" "> +++ b/arch/arm/boot/dts/da850-evm.dts\n" "> @@ -30,6 +30,11 @@\n" - "> \t\tmdio: davinci_mdio at 1e24000 {\n" + "> \t\tmdio: davinci_mdio@1e24000 {\n" "> \t\t\tstatus = \"okay\";\n" "> \t\t};\n" - "> +\t\teth0: emac at 1e20000 {\n" + "> +\t\teth0: emac@1e20000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t\tpinctrl-names = \"default\";\n" "> +\t\t\tpinctrl-0 = <&mii_pins>;\n" "> +\t\t};\n" "> \t};\n" - "> \tnand_cs3 at 62000000 {\n" + "> \tnand_cs3@62000000 {\n" "> \t\tstatus = \"okay\";\n" "> diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi\n" "> index ba28f2d..76905f3 100644\n" @@ -79,13 +87,13 @@ "> +\t\t\t\t>;\n" "> +\t\t\t};\n" "> \t\t};\n" - "> \t\tserial0: serial at 1c42000 {\n" + "> \t\tserial0: serial@1c42000 {\n" "> \t\t\tcompatible = \"ns16550a\";\n" "> @@ -88,6 +108,21 @@\n" "> \t\t\treg = <0x224000 0x1000>;\n" "> \t\t\tbus_freq = <2200000>;\n" "> \t\t};\n" - "> +\t\teth0: emac at 1e20000 {\n" + "> +\t\teth0: emac@1e20000 {\n" "> +\t\t\tcompatible = \"ti,davinci-dm6467-emac\";\n" "> +\t\t\treg = <0x220000 0x4000>;\n" "> +\t\t\tti,davinci-ctrl-reg-offset = <0x3000>;\n" @@ -106,4 +114,4 @@ "Thanks,\n" Sekhar -f697764cc817b95b82178f4fd2b6cc0c7d8f481bcb955833f4678e4ea72afd66 +b25ffadd4a19b86611c6b9b912bfefbe0c7dc07d0c9cab9a6b33c9044d4c92ec
diff --git a/a/1.txt b/N2/1.txt index dc5d309..1a19a15 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -5,11 +5,11 @@ On 1/28/2013 7:17 PM, Prabhakar Lad wrote: > providing interrupt details and local mac address of eth0. > > Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com> -> Cc: linux-arm-kernel at lists.infradead.org -> Cc: linux-kernel at vger.kernel.org -> Cc: davinci-linux-open-source at linux.davincidsp.com -> Cc: netdev at vger.kernel.org -> Cc: devicetree-discuss at lists.ozlabs.org +> Cc: linux-arm-kernel@lists.infradead.org +> Cc: linux-kernel@vger.kernel.org +> Cc: davinci-linux-open-source@linux.davincidsp.com +> Cc: netdev@vger.kernel.org +> Cc: devicetree-discuss@lists.ozlabs.org > Cc: Sekhar Nori <nsekhar@ti.com> > Cc: Heiko Schocher <hs@denx.de> > --- @@ -22,16 +22,16 @@ On 1/28/2013 7:17 PM, Prabhakar Lad wrote: > --- a/arch/arm/boot/dts/da850-evm.dts > +++ b/arch/arm/boot/dts/da850-evm.dts > @@ -30,6 +30,11 @@ -> mdio: davinci_mdio at 1e24000 { +> mdio: davinci_mdio@1e24000 { > status = "okay"; > }; -> + eth0: emac at 1e20000 { +> + eth0: emac@1e20000 { > + status = "okay"; > + pinctrl-names = "default"; > + pinctrl-0 = <&mii_pins>; > + }; > }; -> nand_cs3 at 62000000 { +> nand_cs3@62000000 { > status = "okay"; > diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi > index ba28f2d..76905f3 100644 @@ -71,13 +71,13 @@ it here. > + >; > + }; > }; -> serial0: serial at 1c42000 { +> serial0: serial@1c42000 { > compatible = "ns16550a"; > @@ -88,6 +108,21 @@ > reg = <0x224000 0x1000>; > bus_freq = <2200000>; > }; -> + eth0: emac at 1e20000 { +> + eth0: emac@1e20000 { > + compatible = "ti,davinci-dm6467-emac"; > + reg = <0x220000 0x4000>; > + ti,davinci-ctrl-reg-offset = <0x3000>; diff --git a/a/content_digest b/N2/content_digest index cb39a6e..2398650 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,17 @@ "ref\01359380879-26306-1-git-send-email-prabhakar.lad@ti.com\0" "ref\01359380879-26306-5-git-send-email-prabhakar.lad@ti.com\0" - "From\0nsekhar@ti.com (Sekhar Nori)\0" - "Subject\0[PATCH v2 4/6] ARM: davinci: da850: add DT node for eth0.\0" + "From\0Sekhar Nori <nsekhar@ti.com>\0" + "Subject\0Re: [PATCH v2 4/6] ARM: davinci: da850: add DT node for eth0.\0" "Date\0Sun, 3 Feb 2013 17:33:11 +0530\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Prabhakar Lad <prabhakar.csengg@gmail.com>\0" + "Cc\0<linux-arm-kernel@lists.infradead.org>" + <davinci-linux-open-source@linux.davincidsp.com> + <linux-kernel@vger.kernel.org> + <netdev@vger.kernel.org> + <devicetree-discuss@lists.ozlabs.org> + Heiko Schocher <hs@denx.de> + Lad + " Prabhakar <prabhakar.lad@ti.com>\0" "\00:1\0" "b\0" "On 1/28/2013 7:17 PM, Prabhakar Lad wrote:\n" @@ -13,11 +21,11 @@ "> providing interrupt details and local mac address of eth0.\n" "> \n" "> Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>\n" - "> Cc: linux-arm-kernel at lists.infradead.org\n" - "> Cc: linux-kernel at vger.kernel.org\n" - "> Cc: davinci-linux-open-source at linux.davincidsp.com\n" - "> Cc: netdev at vger.kernel.org\n" - "> Cc: devicetree-discuss at lists.ozlabs.org\n" + "> Cc: linux-arm-kernel@lists.infradead.org\n" + "> Cc: linux-kernel@vger.kernel.org\n" + "> Cc: davinci-linux-open-source@linux.davincidsp.com\n" + "> Cc: netdev@vger.kernel.org\n" + "> Cc: devicetree-discuss@lists.ozlabs.org\n" "> Cc: Sekhar Nori <nsekhar@ti.com>\n" "> Cc: Heiko Schocher <hs@denx.de>\n" "> ---\n" @@ -30,16 +38,16 @@ "> --- a/arch/arm/boot/dts/da850-evm.dts\n" "> +++ b/arch/arm/boot/dts/da850-evm.dts\n" "> @@ -30,6 +30,11 @@\n" - "> \t\tmdio: davinci_mdio at 1e24000 {\n" + "> \t\tmdio: davinci_mdio@1e24000 {\n" "> \t\t\tstatus = \"okay\";\n" "> \t\t};\n" - "> +\t\teth0: emac at 1e20000 {\n" + "> +\t\teth0: emac@1e20000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t\tpinctrl-names = \"default\";\n" "> +\t\t\tpinctrl-0 = <&mii_pins>;\n" "> +\t\t};\n" "> \t};\n" - "> \tnand_cs3 at 62000000 {\n" + "> \tnand_cs3@62000000 {\n" "> \t\tstatus = \"okay\";\n" "> diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi\n" "> index ba28f2d..76905f3 100644\n" @@ -79,13 +87,13 @@ "> +\t\t\t\t>;\n" "> +\t\t\t};\n" "> \t\t};\n" - "> \t\tserial0: serial at 1c42000 {\n" + "> \t\tserial0: serial@1c42000 {\n" "> \t\t\tcompatible = \"ns16550a\";\n" "> @@ -88,6 +108,21 @@\n" "> \t\t\treg = <0x224000 0x1000>;\n" "> \t\t\tbus_freq = <2200000>;\n" "> \t\t};\n" - "> +\t\teth0: emac at 1e20000 {\n" + "> +\t\teth0: emac@1e20000 {\n" "> +\t\t\tcompatible = \"ti,davinci-dm6467-emac\";\n" "> +\t\t\treg = <0x220000 0x4000>;\n" "> +\t\t\tti,davinci-ctrl-reg-offset = <0x3000>;\n" @@ -106,4 +114,4 @@ "Thanks,\n" Sekhar -f697764cc817b95b82178f4fd2b6cc0c7d8f481bcb955833f4678e4ea72afd66 +d4f07970d44d392fe30e189d6541d318f47c5f883fdf53f21ed8249579238673
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.