diff for duplicates of <549D2A9D.50407@atmel.com> diff --git a/a/1.txt b/N1/1.txt index b3482e6..e5576a3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -62,12 +62,12 @@ On 12/5/2014 6:30 AM, Boris Brezillon wrote: > + - atmel,write-by-sram: boolean to enable NFC write by sram. > > Examples: -> nand0: nand@40000000,0 { -> @@ -89,21 +93,23 @@ nand0: nand@40000000 { +> nand0: nand at 40000000,0 { +> @@ -89,21 +93,23 @@ nand0: nand at 40000000 { > }; > > /* for NFC supported chips */ -> +nfc: nfc@70000000 { +> +nfc: nfc at 70000000 { > + compatible = "atmel,sama5d3-nfc"; > + #address-cells = <1>; > + #size-cells = <1>; @@ -79,14 +79,14 @@ On 12/5/2014 6:30 AM, Boris Brezillon wrote: > + >; > +}; > + -> nand0: nand@40000000 { +> nand0: nand at 40000000 { > compatible = "atmel,at91rm9200-nand"; > #address-cells = <1>; > #size-cells = <1>; > ranges; > + atmel,nfc = <&nfc>; > ... -> - nfc@70000000 { +> - nfc at 70000000 { > - compatible = "atmel,sama5d3-nfc"; > - #address-cells = <1>; > - #size-cells = <1>; diff --git a/a/content_digest b/N1/content_digest index 62ffdc8..bd9bc6c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,24 +1,9 @@ "ref\01417732214-3292-1-git-send-email-boris.brezillon@free-electrons.com\0" "ref\01417732214-3292-3-git-send-email-boris.brezillon@free-electrons.com\0" - "From\0Josh Wu <josh.wu@atmel.com>\0" - "Subject\0Re: [PATCH 2/4] mtd: nand: atmel: Update DT documentation after splitting NFC and NAND\0" + "From\0josh.wu@atmel.com (Josh Wu)\0" + "Subject\0[PATCH 2/4] mtd: nand: atmel: Update DT documentation after splitting NFC and NAND\0" "Date\0Fri, 26 Dec 2014 17:30:05 +0800\0" - "To\0Boris Brezillon <boris.brezillon@free-electrons.com>" - David Woodhouse <dwmw2@infradead.org> - Brian Norris <computersforpeace@gmail.com> - <linux-mtd@lists.infradead.org> - Nicolas Ferre <nicolas.ferre@atmel.com> - Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> - Alexandre Belloni <alexandre.belloni@free-electrons.com> - " Andrew Victor <linux@maxim.org.za>\0" - "Cc\0Mark Rutland <mark.rutland@arm.com>" - devicetree@vger.kernel.org - Pawel Moll <pawel.moll@arm.com> - Ian Campbell <ijc+devicetree@hellion.org.uk> - linux-kernel@vger.kernel.org - Rob Herring <robh+dt@kernel.org> - Kumar Gala <galak@codeaurora.org> - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi, Boris\n" @@ -85,12 +70,12 @@ "> + - atmel,write-by-sram: boolean to enable NFC write by sram.\n" "> \n" "> Examples:\n" - "> nand0: nand@40000000,0 {\n" - "> @@ -89,21 +93,23 @@ nand0: nand@40000000 {\n" + "> nand0: nand at 40000000,0 {\n" + "> @@ -89,21 +93,23 @@ nand0: nand at 40000000 {\n" "> };\n" "> \n" "> /* for NFC supported chips */\n" - "> +nfc: nfc@70000000 {\n" + "> +nfc: nfc at 70000000 {\n" "> +\tcompatible = \"atmel,sama5d3-nfc\";\n" "> +\t#address-cells = <1>;\n" "> +\t#size-cells = <1>;\n" @@ -102,14 +87,14 @@ "> +\t>;\n" "> +};\n" "> +\n" - "> nand0: nand@40000000 {\n" + "> nand0: nand at 40000000 {\n" "> \tcompatible = \"atmel,at91rm9200-nand\";\n" "> \t#address-cells = <1>;\n" "> \t#size-cells = <1>;\n" "> \tranges;\n" "> +\tatmel,nfc = <&nfc>;\n" "> ...\n" - "> - nfc@70000000 {\n" + "> - nfc at 70000000 {\n" "> -\t\tcompatible = \"atmel,sama5d3-nfc\";\n" "> -\t\t#address-cells = <1>;\n" "> -\t\t#size-cells = <1>;\n" @@ -122,4 +107,4 @@ "> -\t};\n" > }; -5d40b19d38ded41bab00218881fcd39b48d079917c2b302b9b7e524732acc8f9 +2b7d3581017bb599342643d9de888eac95d29013961a0ef4f83ba09035524d4e
diff --git a/a/1.txt b/N2/1.txt index b3482e6..077a592 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -25,7 +25,7 @@ On 12/5/2014 6:30 AM, Boris Brezillon wrote: > Move the NFC node outside of the NAND node, to get a more future-proof > model. > -> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> +> Signed-off-by: Boris Brezillon <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> > --- > .../devicetree/bindings/mtd/atmel-nand.txt | 46 ++++++++++++---------- > 1 file changed, 26 insertions(+), 20 deletions(-) @@ -98,3 +98,8 @@ On 12/5/2014 6:30 AM, Boris Brezillon wrote: > - >; > - }; > }; + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index 62ffdc8..00f48cc 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,24 +1,25 @@ "ref\01417732214-3292-1-git-send-email-boris.brezillon@free-electrons.com\0" "ref\01417732214-3292-3-git-send-email-boris.brezillon@free-electrons.com\0" - "From\0Josh Wu <josh.wu@atmel.com>\0" + "ref\01417732214-3292-3-git-send-email-boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org\0" + "From\0Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0" "Subject\0Re: [PATCH 2/4] mtd: nand: atmel: Update DT documentation after splitting NFC and NAND\0" "Date\0Fri, 26 Dec 2014 17:30:05 +0800\0" - "To\0Boris Brezillon <boris.brezillon@free-electrons.com>" - David Woodhouse <dwmw2@infradead.org> - Brian Norris <computersforpeace@gmail.com> - <linux-mtd@lists.infradead.org> - Nicolas Ferre <nicolas.ferre@atmel.com> - Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> - Alexandre Belloni <alexandre.belloni@free-electrons.com> - " Andrew Victor <linux@maxim.org.za>\0" - "Cc\0Mark Rutland <mark.rutland@arm.com>" - devicetree@vger.kernel.org - Pawel Moll <pawel.moll@arm.com> - Ian Campbell <ijc+devicetree@hellion.org.uk> - linux-kernel@vger.kernel.org - Rob Herring <robh+dt@kernel.org> - Kumar Gala <galak@codeaurora.org> - " linux-arm-kernel@lists.infradead.org\0" + "To\0Boris Brezillon <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>" + David Woodhouse <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> + Brian Norris <computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> + linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> + Jean-Christophe Plagniol-Villard <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org> + Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> + " Andrew Victor <linux-PelNFVqkFnVyf+4FbqDuWQ@public.gmane.org>\0" + "Cc\0Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>" + Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> + Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "Hi, Boris\n" @@ -48,7 +49,7 @@ "> Move the NFC node outside of the NAND node, to get a more future-proof\n" "> model.\n" ">\n" - "> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>\n" + "> Signed-off-by: Boris Brezillon <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" "> ---\n" "> .../devicetree/bindings/mtd/atmel-nand.txt | 46 ++++++++++++----------\n" "> 1 file changed, 26 insertions(+), 20 deletions(-)\n" @@ -120,6 +121,11 @@ "> -\t\t\t0x00200000 0x00100000\t/* NFC SRAM banks */\n" "> -\t\t>;\n" "> -\t};\n" - > }; + "> };\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -5d40b19d38ded41bab00218881fcd39b48d079917c2b302b9b7e524732acc8f9 +8506fe493d0008a51a7b9253729c5d6ab4c0164ef6b504e79ad8f6a139e21718
diff --git a/a/content_digest b/N3/content_digest index 62ffdc8..3784155 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -11,14 +11,14 @@ Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> Alexandre Belloni <alexandre.belloni@free-electrons.com> " Andrew Victor <linux@maxim.org.za>\0" - "Cc\0Mark Rutland <mark.rutland@arm.com>" - devicetree@vger.kernel.org + "Cc\0Rob Herring <robh+dt@kernel.org>" Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> Ian Campbell <ijc+devicetree@hellion.org.uk> - linux-kernel@vger.kernel.org - Rob Herring <robh+dt@kernel.org> Kumar Gala <galak@codeaurora.org> - " linux-arm-kernel@lists.infradead.org\0" + <devicetree@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "Hi, Boris\n" @@ -122,4 +122,4 @@ "> -\t};\n" > }; -5d40b19d38ded41bab00218881fcd39b48d079917c2b302b9b7e524732acc8f9 +f5006694416bcad9645cacdb47e17fe0762a24ea9b1ec8de806bff735b8d46d5
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.