diff for duplicates of <51A6EE46.6050701@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 51bce2b..51ba361 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,7 @@ On 5/27/2013 6:26 PM, Jean-Christophe PLAGNIOL-VILLARD wrote: > > I like this > -> nand0: nand@60000000 { +> nand0: nand at 60000000 { > compatible = "atmel,at91rm9200-nand"; > #address-cells = <1>; > #size-cells = <1>; @@ -38,7 +38,7 @@ On 5/27/2013 6:26 PM, Jean-Christophe PLAGNIOL-VILLARD wrote: > atmel,pmecc-lookup-table-offset = <0x10000 0x18000>; > status = "disabled"; > -> nfc@70000000 { +> nfc at 70000000 { > compatible = "atmel,sama5d3-nfc"; > reg = < 0x70000000 0x10000000 /* NFC Command Registers */ > 0xffffc000 0x00000070 /* NFC HSMC regs */ @@ -63,17 +63,17 @@ pinctrl can access it. Seems that is enough for me. > > >>>> Examples: ->>>> nand0: nand@40000000,0 { +>>>> nand0: nand at 40000000,0 { >>>> diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c >>>> index f747791..48d7ee6 100644 >>>> --- a/drivers/mtd/nand/atmel_nand.c >>>> +++ b/drivers/mtd/nand/atmel_nand.c >>>> @@ -18,6 +18,9 @@ >>>> * Add Programmable Multibit ECC support for various AT91 SoC ->>>> * © Copyright 2012 ATMEL, Hong Xu +>>>> * ? Copyright 2012 ATMEL, Hong Xu >>>> * >>>> + * Add Nand Flash Controller support for SAMA5 SoC ->>>> + * © Copyright 2013 ATMEL, Josh Wu (josh.wu@atmel.com) +>>>> + * ? Copyright 2013 ATMEL, Josh Wu (josh.wu at atmel.com) >>>> + * >>>> * This program is free software; you can redistribute it and/or modify >>>> * it under the terms of the GNU General Public License version 2 as diff --git a/a/content_digest b/N1/content_digest index 48a32ff..cfba835 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,14 +3,10 @@ "ref\020130524200947.GM24476@game.jcrosoft.org\0" "ref\051A32DD2.9040707@atmel.com\0" "ref\020130527102603.GR24476@game.jcrosoft.org\0" - "From\0Josh Wu <josh.wu@atmel.com>\0" - "Subject\0Re: [PATCH v2 2/4] mtd: atmel_nand: add Nand Flash Controller (NFC) support\0" + "From\0josh.wu@atmel.com (Josh Wu)\0" + "Subject\0[PATCH v2 2/4] mtd: atmel_nand: add Nand Flash Controller (NFC) support\0" "Date\0Thu, 30 May 2013 14:14:30 +0800\0" - "To\0Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>\0" - "Cc\0nicolas.ferre@atmel.com" - linux-mtd@lists.infradead.org - linux-arm-kernel@lists.infradead.org - " dedekind1@gmail.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi, JC\n" @@ -36,7 +32,7 @@ ">\n" "> I like this\n" ">\n" - "> \t\tnand0: nand@60000000 {\n" + "> \t\tnand0: nand at 60000000 {\n" "> \t\t\tcompatible = \"atmel,at91rm9200-nand\";\n" "> \t\t\t#address-cells = <1>;\n" "> \t\t\t#size-cells = <1>;\n" @@ -53,7 +49,7 @@ "> \t\t\tatmel,pmecc-lookup-table-offset = <0x10000 0x18000>;\n" "> \t\t\tstatus = \"disabled\";\n" ">\n" - "> \t\t\tnfc@70000000 {\n" + "> \t\t\tnfc at 70000000 {\n" "> \t\t\t\tcompatible = \"atmel,sama5d3-nfc\";\n" "> \t\t\t\treg = < 0x70000000 0x10000000 /* NFC Command Registers */\n" "> \t\t\t\t\t0xffffc000 0x00000070 /* NFC HSMC regs */\n" @@ -78,17 +74,17 @@ ">\n" ">\n" ">>>> Examples:\n" - ">>>> nand0: nand@40000000,0 {\n" + ">>>> nand0: nand at 40000000,0 {\n" ">>>> diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c\n" ">>>> index f747791..48d7ee6 100644\n" ">>>> --- a/drivers/mtd/nand/atmel_nand.c\n" ">>>> +++ b/drivers/mtd/nand/atmel_nand.c\n" ">>>> @@ -18,6 +18,9 @@\n" ">>>> * Add Programmable Multibit ECC support for various AT91 SoC\n" - ">>>> * \302\251 Copyright 2012 ATMEL, Hong Xu\n" + ">>>> * ? Copyright 2012 ATMEL, Hong Xu\n" ">>>> *\n" ">>>> + * Add Nand Flash Controller support for SAMA5 SoC\n" - ">>>> + * \302\251 Copyright 2013 ATMEL, Josh Wu (josh.wu@atmel.com)\n" + ">>>> + * ? Copyright 2013 ATMEL, Josh Wu (josh.wu at atmel.com)\n" ">>>> + *\n" ">>>> * This program is free software; you can redistribute it and/or modify\n" ">>>> * it under the terms of the GNU General Public License version 2 as\n" @@ -148,4 +144,4 @@ "> Best Regards,\n" > J. -76ff778c134b82f127ba4ec079c373779561877820a16463136bce4624dbaa49 +8fd8af43c413f4e35044fcb1b81ea4feb59836eb50cdfed548fadefac80c8763
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.