diff for duplicates of <551651A8.3030307@hisilicon.com> diff --git a/a/1.txt b/N1/1.txt index 0781639..d1d1be4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,7 @@ Yes, I will ping him to check the patch. >> Now it is based on v4.0-rc5 >> >> Changes in v3: ->> - Change E-mail address in signed-off-by to "wangzhou1@hisilicon.com" +>> - Change E-mail address in signed-off-by to "wangzhou1 at hisilicon.com" >> Changes in v2: >> - Base on v3.19-rc1 >> - Use nand-ecc-strength, nand-ecc-step-size to replace hisi,nand-ecc-bits @@ -30,32 +30,32 @@ Yes, I will ping him to check the patch. >> --- a/arch/arm/boot/dts/hip04-d01.dts >> +++ b/arch/arm/boot/dts/hip04-d01.dts >> @@ -28,5 +28,32 @@ ->> uart0: uart@4007000 { +>> uart0: uart at 4007000 { >> status = "ok"; >> }; >> + ->> + nand: nand@4020000 { +>> + nand: nand at 4020000 { >> + nand-bus-width = <8>; >> + nand-ecc-mode = "hw"; >> + nand-ecc-strength = <16>; >> + nand-ecc-step-size = <1024>; >> + ->> + partition@0 { +>> + partition at 0 { >> + label = "nand_text"; >> + reg = <0x00000000 0x00400000>; >> + }; >> + ->> + partition@00400000 { +>> + partition at 00400000 { >> + label = "nand_monitor"; >> + reg = <0x00400000 0x00400000>; >> + }; >> + ->> + partition@00800000 { +>> + partition at 00800000 { >> + label = "nand_kernel"; >> + reg = <0x00800000 0x00800000>; >> + }; >> + ->> + partition@01000000 { +>> + partition at 01000000 { >> + label = "nand_fs"; >> + reg = <0x01000000 0x1f000000>; >> + }; @@ -70,7 +70,7 @@ Yes, I will ping him to check the patch. >> interrupts = <0 372 4>; >> }; >> ->> + nand: nand@4020000 { +>> + nand: nand at 4020000 { >> + compatible = "hisilicon,504-nfc"; >> + reg = <0x4020000 0x10000>, <0x5000000 0x1000>; >> + interrupts = <0 379 4>; @@ -88,7 +88,7 @@ Zhou >> }; >> ->> etb@0,e3c42000 { +>> etb at 0,e3c42000 { >> -- >> 1.9.1 >> diff --git a/a/content_digest b/N1/content_digest index e023865..6d24d88 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,9 @@ "ref\01427267091-227474-1-git-send-email-wangzhou1@hisilicon.com\0" "ref\020150327173504.GY32500@ld-irv-0074\0" - "From\0Zhou Wang <wangzhou1@hisilicon.com>\0" - "Subject\0Re: [RESEND PATCH v3] mtd: hisilicon: add device tree node for NAND controller\0" + "From\0wangzhou1@hisilicon.com (Zhou Wang)\0" + "Subject\0[RESEND PATCH v3] mtd: hisilicon: add device tree node for NAND controller\0" "Date\0Sat, 28 Mar 2015 15:00:56 +0800\0" - "To\0Brian Norris <computersforpeace@gmail.com>\0" - "Cc\0devicetree@vger.kernel.org" - Arnd Bergmann <arnd@arndb.de> - Wei Xu <xuwei5@hisilicon.com> - linux-mtd@lists.infradead.org - Haojian Zhuang <haojian.zhuang@linaro.org> - liguozhu@hisilicon.com - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 2015/3/28 1:35, Brian Norris wrote:\n" @@ -26,7 +19,7 @@ ">> Now it is based on v4.0-rc5\n" ">>\n" ">> Changes in v3:\n" - ">> - Change E-mail address in signed-off-by to \"wangzhou1@hisilicon.com\"\n" + ">> - Change E-mail address in signed-off-by to \"wangzhou1 at hisilicon.com\"\n" ">> Changes in v2:\n" ">> - Base on v3.19-rc1\n" ">> - Use nand-ecc-strength, nand-ecc-step-size to replace hisi,nand-ecc-bits\n" @@ -45,32 +38,32 @@ ">> --- a/arch/arm/boot/dts/hip04-d01.dts\n" ">> +++ b/arch/arm/boot/dts/hip04-d01.dts\n" ">> @@ -28,5 +28,32 @@\n" - ">> \t\tuart0: uart@4007000 {\n" + ">> \t\tuart0: uart at 4007000 {\n" ">> \t\t\tstatus = \"ok\";\n" ">> \t\t};\n" ">> +\n" - ">> +\t\tnand: nand@4020000 {\n" + ">> +\t\tnand: nand at 4020000 {\n" ">> +\t\t\tnand-bus-width = <8>;\n" ">> +\t\t\tnand-ecc-mode = \"hw\";\n" ">> +\t\t\tnand-ecc-strength = <16>;\n" ">> +\t\t\tnand-ecc-step-size = <1024>;\n" ">> +\n" - ">> +\t\t\tpartition@0 {\n" + ">> +\t\t\tpartition at 0 {\n" ">> +\t\t\t\tlabel = \"nand_text\";\n" ">> +\t\t\t\treg = <0x00000000 0x00400000>;\n" ">> +\t\t\t};\n" ">> +\n" - ">> +\t\t\tpartition@00400000 {\n" + ">> +\t\t\tpartition at 00400000 {\n" ">> +\t\t\t\tlabel = \"nand_monitor\";\n" ">> +\t\t\t\treg = <0x00400000 0x00400000>;\n" ">> +\t\t\t};\n" ">> +\n" - ">> +\t\t\tpartition@00800000 {\n" + ">> +\t\t\tpartition at 00800000 {\n" ">> +\t\t\t\tlabel = \"nand_kernel\";\n" ">> +\t\t\t\treg = <0x00800000 0x00800000>;\n" ">> +\t\t\t};\n" ">> +\n" - ">> +\t\t\tpartition@01000000 {\n" + ">> +\t\t\tpartition at 01000000 {\n" ">> +\t\t\t\tlabel = \"nand_fs\";\n" ">> +\t\t\t\treg = <0x01000000 0x1f000000>;\n" ">> +\t\t\t};\n" @@ -85,7 +78,7 @@ ">> \t\t\tinterrupts = <0 372 4>;\n" ">> \t\t};\n" ">> \n" - ">> +\t\tnand: nand@4020000 {\n" + ">> +\t\tnand: nand at 4020000 {\n" ">> +\t\t\tcompatible = \"hisilicon,504-nfc\";\n" ">> +\t\t\treg = <0x4020000 0x10000>, <0x5000000 0x1000>;\n" ">> +\t\t\tinterrupts = <0 379 4>;\n" @@ -103,7 +96,7 @@ "\n" ">> \t};\n" ">> \n" - ">> \tetb@0,e3c42000 {\n" + ">> \tetb at 0,e3c42000 {\n" ">> -- \n" ">> 1.9.1\n" ">>\n" @@ -111,4 +104,4 @@ "> .\n" > -05989a95d79be8c5f0fb10b502df023350e5b869c54ff2d267e6911257bd3142 +a0a674c3ec419de162320599647a13158c60f598398add7ab2500a21b3564cef
diff --git a/a/1.txt b/N2/1.txt index 0781639..91c28dc 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -11,7 +11,7 @@ Yes, I will ping him to check the patch. >> Now it is based on v4.0-rc5 >> >> Changes in v3: ->> - Change E-mail address in signed-off-by to "wangzhou1@hisilicon.com" +>> - Change E-mail address in signed-off-by to "wangzhou1-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org" >> Changes in v2: >> - Base on v3.19-rc1 >> - Use nand-ecc-strength, nand-ecc-step-size to replace hisi,nand-ecc-bits @@ -19,7 +19,7 @@ Yes, I will ping him to check the patch. >> - Move partition and other board related information into board dts file: >> hip04-d01.dts >> ->> Signed-off-by: Zhou Wang <wangzhou1@hisilicon.com> +>> Signed-off-by: Zhou Wang <wangzhou1-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org> >> --- >> arch/arm/boot/dts/hip04-d01.dts | 27 +++++++++++++++++++++++++++ >> arch/arm/boot/dts/hip04.dtsi | 7 +++++++ @@ -80,7 +80,7 @@ Yes, I will ping him to check the patch. > > Seems reasonable and matches the binding we already accepted, so: > -> Reviewed-by: Brian Norris <computersforpeace@gmail.com> +> Reviewed-by: Brian Norris <computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > Thanks, @@ -94,4 +94,10 @@ Zhou >> > > . -> +> + + +-- +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 e023865..fb74910 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,16 @@ "ref\01427267091-227474-1-git-send-email-wangzhou1@hisilicon.com\0" "ref\020150327173504.GY32500@ld-irv-0074\0" - "From\0Zhou Wang <wangzhou1@hisilicon.com>\0" + "From\0Zhou Wang <wangzhou1-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>\0" "Subject\0Re: [RESEND PATCH v3] mtd: hisilicon: add device tree node for NAND controller\0" "Date\0Sat, 28 Mar 2015 15:00:56 +0800\0" - "To\0Brian Norris <computersforpeace@gmail.com>\0" - "Cc\0devicetree@vger.kernel.org" - Arnd Bergmann <arnd@arndb.de> - Wei Xu <xuwei5@hisilicon.com> - linux-mtd@lists.infradead.org - Haojian Zhuang <haojian.zhuang@linaro.org> - liguozhu@hisilicon.com - " linux-arm-kernel@lists.infradead.org\0" + "To\0Brian Norris <computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Cc\0Haojian Zhuang <haojian.zhuang-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>" + Wei Xu <xuwei5-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org> + Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " liguozhu-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org\0" "\00:1\0" "b\0" "On 2015/3/28 1:35, Brian Norris wrote:\n" @@ -26,7 +26,7 @@ ">> Now it is based on v4.0-rc5\n" ">>\n" ">> Changes in v3:\n" - ">> - Change E-mail address in signed-off-by to \"wangzhou1@hisilicon.com\"\n" + ">> - Change E-mail address in signed-off-by to \"wangzhou1-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org\"\n" ">> Changes in v2:\n" ">> - Base on v3.19-rc1\n" ">> - Use nand-ecc-strength, nand-ecc-step-size to replace hisi,nand-ecc-bits\n" @@ -34,7 +34,7 @@ ">> - Move partition and other board related information into board dts file:\n" ">> hip04-d01.dts\n" ">>\n" - ">> Signed-off-by: Zhou Wang <wangzhou1@hisilicon.com>\n" + ">> Signed-off-by: Zhou Wang <wangzhou1-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>\n" ">> ---\n" ">> arch/arm/boot/dts/hip04-d01.dts | 27 +++++++++++++++++++++++++++\n" ">> arch/arm/boot/dts/hip04.dtsi | 7 +++++++\n" @@ -95,7 +95,7 @@ "> \n" "> Seems reasonable and matches the binding we already accepted, so:\n" "> \n" - "> Reviewed-by: Brian Norris <computersforpeace@gmail.com>\n" + "> Reviewed-by: Brian Norris <computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "> \n" "\n" "Thanks,\n" @@ -109,6 +109,12 @@ ">>\n" "> \n" "> .\n" - > + "> \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 -05989a95d79be8c5f0fb10b502df023350e5b869c54ff2d267e6911257bd3142 +abaff087273797137c4c76071b93b157cb2507c765a6fcb2396d906f3f5af95d
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.