diff for duplicates of <510224EA.9080705@ti.com> diff --git a/a/1.txt b/N1/1.txt index 128f76f..a835a31 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,11 +7,11 @@ On 1/21/2013 11:59 AM, 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> > --- @@ -27,10 +27,10 @@ Can you rebase this to apply to v3.9/dt branch of my tree? > --- a/arch/arm/boot/dts/da850-evm.dts > +++ b/arch/arm/boot/dts/da850-evm.dts > @@ -24,5 +24,8 @@ -> serial2: serial at 1d0d000 { +> serial2: serial@1d0d000 { > status = "okay"; > }; -> + eth0: emac at 1e20000 { +> + eth0: emac@1e20000 { > + status = "okay"; > + }; > }; @@ -43,7 +43,7 @@ Can you rebase this to apply to v3.9/dt branch of my tree? > interrupt-parent = <&intc>; > status = "disabled"; > }; -> + 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 a3a26d3..c200b9b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,17 @@ "ref\01358749759-20517-1-git-send-email-prabhakar.lad@ti.com\0" "ref\01358749759-20517-2-git-send-email-prabhakar.lad@ti.com\0" - "From\0nsekhar@ti.com (Sekhar Nori)\0" - "Subject\0[PATCH 1/2] ARM: davinci: da850: add DT node for eth0.\0" + "From\0Sekhar Nori <nsekhar@ti.com>\0" + "Subject\0Re: [PATCH 1/2] ARM: davinci: da850: add DT node for eth0.\0" "Date\0Fri, 25 Jan 2013 11:53:38 +0530\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Prabhakar Lad <prabhakar.csengg@gmail.com>\0" + "Cc\0LAK <linux-arm-kernel@lists.infradead.org>" + DLOS <davinci-linux-open-source@linux.davincidsp.com> + LKML <linux-kernel@vger.kernel.org> + Lad + Prabhakar <prabhakar.lad@ti.com> + netdev@vger.kernel.org + devicetree-discuss@lists.ozlabs.org + " Heiko Schocher <hs@denx.de>\0" "\00:1\0" "b\0" "Prabhakar,\n" @@ -15,11 +23,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" @@ -35,10 +43,10 @@ "> --- a/arch/arm/boot/dts/da850-evm.dts\n" "> +++ b/arch/arm/boot/dts/da850-evm.dts\n" "> @@ -24,5 +24,8 @@\n" - "> \t\tserial2: serial at 1d0d000 {\n" + "> \t\tserial2: serial@1d0d000 {\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};\n" "> \t};\n" @@ -51,7 +59,7 @@ "> \t\t\tinterrupt-parent = <&intc>;\n" "> \t\t\tstatus = \"disabled\";\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" @@ -76,4 +84,4 @@ "Thanks,\n" Sekhar -624a98c445d43c61a7435956fd8d888596c38a2e9519d313206471cfe644ed05 +6428561c59ae9c21fbbb1811bbc197466b3718e2b9cae3b152eb71511496c2e3
diff --git a/a/1.txt b/N2/1.txt index 128f76f..a835a31 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -7,11 +7,11 @@ On 1/21/2013 11:59 AM, 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> > --- @@ -27,10 +27,10 @@ Can you rebase this to apply to v3.9/dt branch of my tree? > --- a/arch/arm/boot/dts/da850-evm.dts > +++ b/arch/arm/boot/dts/da850-evm.dts > @@ -24,5 +24,8 @@ -> serial2: serial at 1d0d000 { +> serial2: serial@1d0d000 { > status = "okay"; > }; -> + eth0: emac at 1e20000 { +> + eth0: emac@1e20000 { > + status = "okay"; > + }; > }; @@ -43,7 +43,7 @@ Can you rebase this to apply to v3.9/dt branch of my tree? > interrupt-parent = <&intc>; > status = "disabled"; > }; -> + 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 a3a26d3..f4ff470 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,17 @@ "ref\01358749759-20517-1-git-send-email-prabhakar.lad@ti.com\0" "ref\01358749759-20517-2-git-send-email-prabhakar.lad@ti.com\0" - "From\0nsekhar@ti.com (Sekhar Nori)\0" - "Subject\0[PATCH 1/2] ARM: davinci: da850: add DT node for eth0.\0" + "From\0Sekhar Nori <nsekhar@ti.com>\0" + "Subject\0Re: [PATCH 1/2] ARM: davinci: da850: add DT node for eth0.\0" "Date\0Fri, 25 Jan 2013 11:53:38 +0530\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Prabhakar Lad <prabhakar.csengg@gmail.com>\0" + "Cc\0LAK <linux-arm-kernel@lists.infradead.org>" + DLOS <davinci-linux-open-source@linux.davincidsp.com> + LKML <linux-kernel@vger.kernel.org> + Lad + Prabhakar <prabhakar.lad@ti.com> + <netdev@vger.kernel.org> + <devicetree-discuss@lists.ozlabs.org> + " Heiko Schocher <hs@denx.de>\0" "\00:1\0" "b\0" "Prabhakar,\n" @@ -15,11 +23,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" @@ -35,10 +43,10 @@ "> --- a/arch/arm/boot/dts/da850-evm.dts\n" "> +++ b/arch/arm/boot/dts/da850-evm.dts\n" "> @@ -24,5 +24,8 @@\n" - "> \t\tserial2: serial at 1d0d000 {\n" + "> \t\tserial2: serial@1d0d000 {\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};\n" "> \t};\n" @@ -51,7 +59,7 @@ "> \t\t\tinterrupt-parent = <&intc>;\n" "> \t\t\tstatus = \"disabled\";\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" @@ -76,4 +84,4 @@ "Thanks,\n" Sekhar -624a98c445d43c61a7435956fd8d888596c38a2e9519d313206471cfe644ed05 +ed606fbb93188a33bc2bf54cbd4c55286ee742dbb6bdbda95665e3aeddade9ef
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.