diff for duplicates of <4EDCAD82.5050006@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 0214ea7..b600280 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ On 12/03/2011 06:56 AM, Jean-Christophe PLAGNIOL-VILLARD : >> Add the Cadence macb ethernet controller in at91sam9g45 .dtsi and >> enable it in at91sam9m10g45ek board device tree file. >> ->> Signed-off-by: Nicolas Ferre<nicolas.ferre@atmel.com> +>> Signed-off-by: Nicolas Ferre<nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> >> --- >> arch/arm/boot/dts/at91sam9g45.dtsi | 7 +++++++ >> arch/arm/boot/dts/at91sam9m10g45ek.dts | 6 ++++++ @@ -18,7 +18,7 @@ On 12/03/2011 06:56 AM, Jean-Christophe PLAGNIOL-VILLARD : >> status = "disabled"; >> }; >> + ->> + macb0: ethernet at fffbc000 { +>> + macb0: ethernet@fffbc000 { >> + compatible = "cdns,at32ap7000-macb", "cdns,macb"; >> + reg =<0xfffbc000 0x100>; >> + interrupts =<25 4>; @@ -37,11 +37,11 @@ https://lkml.org/lkml/2011/12/1/238 >> --- 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 fcd7892..ff92574 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +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" "ref\020111203055659.GL18533@game.jcrosoft.org\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH] ARM: at91/net: add macb ethernet controller in 9g45 DT\0" + "ref\020111203055659.GL18533-RQcB7r2h9QmfDR2tN2SG5Ni2O/JbrIOy@public.gmane.org\0" + "From\0Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH] ARM: at91/net: add macb ethernet controller in 9g45 DT\0" "Date\0Mon, 05 Dec 2011 12:39:46 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jean-Christophe PLAGNIOL-VILLARD <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org>\0" + "Cc\0netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "On 12/03/2011 06:56 AM, Jean-Christophe PLAGNIOL-VILLARD :\n" @@ -12,7 +17,7 @@ ">> Add the Cadence macb ethernet controller in at91sam9g45 .dtsi and\n" ">> enable it in at91sam9m10g45ek board device tree file.\n" ">>\n" - ">> Signed-off-by: Nicolas Ferre<nicolas.ferre@atmel.com>\n" + ">> Signed-off-by: Nicolas Ferre<nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" ">> ---\n" ">> arch/arm/boot/dts/at91sam9g45.dtsi | 7 +++++++\n" ">> arch/arm/boot/dts/at91sam9m10g45ek.dts | 6 ++++++\n" @@ -27,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" @@ -46,11 +51,11 @@ ">> --- 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" @@ -61,4 +66,4 @@ "-- \n" Nicolas Ferre -b4ef763c8fbaa7e1435b9aef734d6a0c74d20bbdb16f9cfeb2a3a7fc307cde97 +7b9cce973b04b707dc63d8bb9e38f706cc2eef183eb6d1959ce2dfb5fd817efc
diff --git a/a/1.txt b/N2/1.txt index 0214ea7..554d3d8 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -18,7 +18,7 @@ On 12/03/2011 06:56 AM, Jean-Christophe PLAGNIOL-VILLARD : >> status = "disabled"; >> }; >> + ->> + macb0: ethernet at fffbc000 { +>> + macb0: ethernet@fffbc000 { >> + compatible = "cdns,at32ap7000-macb", "cdns,macb"; >> + reg =<0xfffbc000 0x100>; >> + interrupts =<25 4>; @@ -37,11 +37,11 @@ https://lkml.org/lkml/2011/12/1/238 >> --- 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 fcd7892..6c8c444 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,17 @@ "ref\01322847782-22650-1-git-send-email-nicolas.ferre@atmel.com\0" "ref\01322848237-23154-1-git-send-email-nicolas.ferre@atmel.com\0" "ref\020111203055659.GL18533@game.jcrosoft.org\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH] ARM: at91/net: add macb ethernet controller in 9g45 DT\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH] ARM: at91/net: add macb ethernet controller in 9g45 DT\0" "Date\0Mon, 05 Dec 2011 12:39:46 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.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 12/03/2011 06:56 AM, Jean-Christophe PLAGNIOL-VILLARD :\n" @@ -27,7 +34,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" @@ -46,11 +53,11 @@ ">> --- 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" @@ -61,4 +68,4 @@ "-- \n" Nicolas Ferre -b4ef763c8fbaa7e1435b9aef734d6a0c74d20bbdb16f9cfeb2a3a7fc307cde97 +7009e52c3f87c763b1adb288abc09dfad89e0e6c28a476486bf9e85fe713e9ad
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.