diff for duplicates of <20111203055659.GL18533@game.jcrosoft.org> diff --git a/a/1.txt b/N1/1.txt index a2a4278..2584ca5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,7 +17,7 @@ On 18:50 Fri 02 Dec , Nicolas Ferre wrote: > status = "disabled"; > }; > + -> + macb0: ethernet at fffbc000 { +> + macb0: ethernet@fffbc000 { > + compatible = "cdns,at32ap7000-macb", "cdns,macb"; > + reg = <0xfffbc000 0x100>; > + interrupts = <25 4>; @@ -32,11 +32,11 @@ why? > --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts > +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts > @@ -30,6 +30,12 @@ -> usart1: serial at fff90000 { +> usart1: serial@fff90000 { > status = "okay"; > }; > + -> + macb0: ethernet at fffbc000 { +> + macb0: ethernet@fffbc000 { > + local-mac-address = [3a 0e 03 04 05 06]; please drop this is not supposed to be in the dts but updated for each board diff --git a/a/content_digest b/N1/content_digest index 518d1de..533e47a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,15 @@ "ref\01322847782-22650-1-git-send-email-nicolas.ferre@atmel.com\0" "ref\01322848237-23154-1-git-send-email-nicolas.ferre@atmel.com\0" - "From\0plagnioj@jcrosoft.com (Jean-Christophe PLAGNIOL-VILLARD)\0" - "Subject\0[PATCH] ARM: at91/net: add macb ethernet controller in 9g45 DT\0" + "From\0Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>\0" + "Subject\0Re: [PATCH] ARM: at91/net: add macb ethernet controller in 9g45 DT\0" "Date\0Sat, 3 Dec 2011 06:56:59 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Cc\0netdev@vger.kernel.org" + devicetree-discuss@lists.ozlabs.org + linux-kernel@vger.kernel.org + grant.likely@secretlab.ca + jamie@jamieiles.com + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 18:50 Fri 02 Dec , Nicolas Ferre wrote:\n" @@ -25,7 +31,7 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tmacb0: ethernet at fffbc000 {\n" + "> +\t\t\tmacb0: ethernet@fffbc000 {\n" "> +\t\t\t\tcompatible = \"cdns,at32ap7000-macb\", \"cdns,macb\";\n" "> +\t\t\t\treg = <0xfffbc000 0x100>;\n" "> +\t\t\t\tinterrupts = <25 4>;\n" @@ -40,15 +46,15 @@ "> --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts\n" "> +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts\n" "> @@ -30,6 +30,12 @@\n" - "> \t\t\tusart1: serial at fff90000 {\n" + "> \t\t\tusart1: serial@fff90000 {\n" "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tmacb0: ethernet at fffbc000 {\n" + "> +\t\t\tmacb0: ethernet@fffbc000 {\n" "> +\t\t\t\tlocal-mac-address = [3a 0e 03 04 05 06];\n" "please drop this is not supposed to be in the dts but updated for each board\n" "\n" "Best Regards,\n" J. -d7006305c3641ff52fd26f4b3e263542a3ac0499541ddae6ee9e8913ba9f05cf +ba098e1d9d3dfc24653ced6718381b04c0c62bcf84efbd51d3eaee63c0348260
diff --git a/a/1.txt b/N2/1.txt index a2a4278..2584ca5 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -17,7 +17,7 @@ On 18:50 Fri 02 Dec , Nicolas Ferre wrote: > status = "disabled"; > }; > + -> + macb0: ethernet at fffbc000 { +> + macb0: ethernet@fffbc000 { > + compatible = "cdns,at32ap7000-macb", "cdns,macb"; > + reg = <0xfffbc000 0x100>; > + interrupts = <25 4>; @@ -32,11 +32,11 @@ why? > --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts > +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts > @@ -30,6 +30,12 @@ -> usart1: serial at fff90000 { +> usart1: serial@fff90000 { > status = "okay"; > }; > + -> + macb0: ethernet at fffbc000 { +> + macb0: ethernet@fffbc000 { > + local-mac-address = [3a 0e 03 04 05 06]; please drop this is not supposed to be in the dts but updated for each board diff --git a/a/content_digest b/N2/content_digest index 518d1de..9ce496c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,16 @@ "ref\01322847782-22650-1-git-send-email-nicolas.ferre@atmel.com\0" "ref\01322848237-23154-1-git-send-email-nicolas.ferre@atmel.com\0" - "From\0plagnioj@jcrosoft.com (Jean-Christophe PLAGNIOL-VILLARD)\0" - "Subject\0[PATCH] ARM: at91/net: add macb ethernet controller in 9g45 DT\0" + "From\0Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>\0" + "Subject\0Re: [PATCH] ARM: at91/net: add macb ethernet controller in 9g45 DT\0" "Date\0Sat, 3 Dec 2011 06:56:59 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Cc\0robherring2@gmail.com" + devicetree-discuss@lists.ozlabs.org + netdev@vger.kernel.org + linux-arm-kernel@lists.infradead.org + grant.likely@secretlab.ca + linux-kernel@vger.kernel.org + " jamie@jamieiles.com\0" "\00:1\0" "b\0" "On 18:50 Fri 02 Dec , Nicolas Ferre wrote:\n" @@ -25,7 +32,7 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tmacb0: ethernet at fffbc000 {\n" + "> +\t\t\tmacb0: ethernet@fffbc000 {\n" "> +\t\t\t\tcompatible = \"cdns,at32ap7000-macb\", \"cdns,macb\";\n" "> +\t\t\t\treg = <0xfffbc000 0x100>;\n" "> +\t\t\t\tinterrupts = <25 4>;\n" @@ -40,15 +47,15 @@ "> --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts\n" "> +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts\n" "> @@ -30,6 +30,12 @@\n" - "> \t\t\tusart1: serial at fff90000 {\n" + "> \t\t\tusart1: serial@fff90000 {\n" "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tmacb0: ethernet at fffbc000 {\n" + "> +\t\t\tmacb0: ethernet@fffbc000 {\n" "> +\t\t\t\tlocal-mac-address = [3a 0e 03 04 05 06];\n" "please drop this is not supposed to be in the dts but updated for each board\n" "\n" "Best Regards,\n" J. -d7006305c3641ff52fd26f4b3e263542a3ac0499541ddae6ee9e8913ba9f05cf +10455b5cd9ce1bda0cf13d3b465d738724d0046f2d914a42644e93d7f954934a
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.