diff for duplicates of <551390E5.2090209@hisilicon.com> diff --git a/a/1.txt b/N1/1.txt index 23dbbc8..0a4f77c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,7 +4,7 @@ On 2015/3/26 10:13, Haojian Zhuang wrote: >> 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 @@ -23,32 +23,32 @@ On 2015/3/26 10:13, Haojian Zhuang wrote: >> --- 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>; >> + }; @@ -63,7 +63,7 @@ On 2015/3/26 10:13, Haojian Zhuang wrote: >> interrupts = <0 372 4>; >> }; >> ->> + nand: nand@4020000 { +>> + nand: nand at 4020000 { >> + compatible = "hisilicon,504-nfc"; >> + reg = <0x4020000 0x10000>, <0x5000000 0x1000>; >> + interrupts = <0 379 4>; @@ -72,7 +72,7 @@ On 2015/3/26 10:13, Haojian Zhuang wrote: >> + }; >> }; >> ->> etb@0,e3c42000 { +>> etb at 0,e3c42000 { >> -- >> 1.9.1 >> diff --git a/a/content_digest b/N1/content_digest index 6f61c9e..1d86967 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\0CAD6h2NQr_Z600vC+7RRuLgoGvV4MCXz8TAd4C5eCnqbA0ZdPWw@mail.gmail.com\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\0Thu, 26 Mar 2015 12:53:57 +0800\0" - "To\0Haojian Zhuang <haojian.zhuang@linaro.org>\0" - "Cc\0devicetree@vger.kernel.org <devicetree@vger.kernel.org>" - Arnd Bergmann <arnd@arndb.de> - Wei Xu <xuwei5@hisilicon.com> - linux-mtd@lists.infradead.org - Brian Norris <computersforpeace@gmail.com> - " Liguozhu \\(Kenneth\\) <liguozhu@hisilicon.com>" - " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 2015/3/26 10:13, Haojian Zhuang wrote:\n" @@ -19,7 +12,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" @@ -38,32 +31,32 @@ ">> --- a/arch/arm/boot/dts/hip04-d01.dts\n" ">> +++ b/arch/arm/boot/dts/hip04-d01.dts\n" ">> @@ -28,5 +28,32 @@\n" - ">> uart0: uart@4007000 {\n" + ">> uart0: uart at 4007000 {\n" ">> status = \"ok\";\n" ">> };\n" ">> +\n" - ">> + nand: nand@4020000 {\n" + ">> + nand: nand at 4020000 {\n" ">> + nand-bus-width = <8>;\n" ">> + nand-ecc-mode = \"hw\";\n" ">> + nand-ecc-strength = <16>;\n" ">> + nand-ecc-step-size = <1024>;\n" ">> +\n" - ">> + partition@0 {\n" + ">> + partition at 0 {\n" ">> + label = \"nand_text\";\n" ">> + reg = <0x00000000 0x00400000>;\n" ">> + };\n" ">> +\n" - ">> + partition@00400000 {\n" + ">> + partition at 00400000 {\n" ">> + label = \"nand_monitor\";\n" ">> + reg = <0x00400000 0x00400000>;\n" ">> + };\n" ">> +\n" - ">> + partition@00800000 {\n" + ">> + partition at 00800000 {\n" ">> + label = \"nand_kernel\";\n" ">> + reg = <0x00800000 0x00800000>;\n" ">> + };\n" ">> +\n" - ">> + partition@01000000 {\n" + ">> + partition at 01000000 {\n" ">> + label = \"nand_fs\";\n" ">> + reg = <0x01000000 0x1f000000>;\n" ">> + };\n" @@ -78,7 +71,7 @@ ">> interrupts = <0 372 4>;\n" ">> };\n" ">>\n" - ">> + nand: nand@4020000 {\n" + ">> + nand: nand at 4020000 {\n" ">> + compatible = \"hisilicon,504-nfc\";\n" ">> + reg = <0x4020000 0x10000>, <0x5000000 0x1000>;\n" ">> + interrupts = <0 379 4>;\n" @@ -87,7 +80,7 @@ ">> + };\n" ">> };\n" ">>\n" - ">> etb@0,e3c42000 {\n" + ">> etb at 0,e3c42000 {\n" ">> --\n" ">> 1.9.1\n" ">>\n" @@ -101,4 +94,4 @@ "Thanks!\n" Zhou Wang -5b08adab675436f8a1f1de91d7f9e85e3e51c46db368bf76f9d13a6cac55035b +95982ad8aa02caaacebcd39da7f7ee4ce61fdea241f17070c584b5ff4003c557
diff --git a/a/1.txt b/N2/1.txt index 23dbbc8..b9ae5ac 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,10 +1,10 @@ On 2015/3/26 10:13, Haojian Zhuang wrote: -> On 25 March 2015 at 15:04, Zhou Wang <wangzhou1@hisilicon.com> wrote: +> On 25 March 2015 at 15:04, Zhou Wang <wangzhou1-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org> wrote: >> This patch adds dts support for NAND flash controller of Hisilicon Soc Hip04. >> 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 @@ -12,7 +12,7 @@ On 2015/3/26 10:13, Haojian Zhuang wrote: >> - 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 +++++++ @@ -77,7 +77,7 @@ On 2015/3/26 10:13, Haojian Zhuang wrote: >> 1.9.1 >> > -> Acked-by: Haojian Zhuang <haojian.zhuang@linaro.org> +> Acked-by: Haojian Zhuang <haojian.zhuang-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> > > . > @@ -85,3 +85,9 @@ On 2015/3/26 10:13, Haojian Zhuang wrote: Thanks! Zhou Wang + + +-- +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 6f61c9e..c47727c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,25 +1,26 @@ "ref\01427267091-227474-1-git-send-email-wangzhou1@hisilicon.com\0" "ref\0CAD6h2NQr_Z600vC+7RRuLgoGvV4MCXz8TAd4C5eCnqbA0ZdPWw@mail.gmail.com\0" - "From\0Zhou Wang <wangzhou1@hisilicon.com>\0" + "ref\0CAD6h2NQr_Z600vC+7RRuLgoGvV4MCXz8TAd4C5eCnqbA0ZdPWw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org\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\0Thu, 26 Mar 2015 12:53:57 +0800\0" - "To\0Haojian Zhuang <haojian.zhuang@linaro.org>\0" - "Cc\0devicetree@vger.kernel.org <devicetree@vger.kernel.org>" - Arnd Bergmann <arnd@arndb.de> - Wei Xu <xuwei5@hisilicon.com> - linux-mtd@lists.infradead.org - Brian Norris <computersforpeace@gmail.com> - " Liguozhu \\(Kenneth\\) <liguozhu@hisilicon.com>" - " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" + "To\0Haojian Zhuang <haojian.zhuang-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" + "Cc\0Wei Xu <xuwei5-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>" + Brian Norris <computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> + Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org> + linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + " Liguozhu (Kenneth) <liguozhu-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>\0" "\00:1\0" "b\0" "On 2015/3/26 10:13, Haojian Zhuang wrote:\n" - "> On 25 March 2015 at 15:04, Zhou Wang <wangzhou1@hisilicon.com> wrote:\n" + "> On 25 March 2015 at 15:04, Zhou Wang <wangzhou1-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org> wrote:\n" ">> This patch adds dts support for NAND flash controller of Hisilicon Soc Hip04.\n" ">> 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" @@ -27,7 +28,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" @@ -92,13 +93,19 @@ ">> 1.9.1\n" ">>\n" "> \n" - "> Acked-by: Haojian Zhuang <haojian.zhuang@linaro.org>\n" + "> Acked-by: Haojian Zhuang <haojian.zhuang-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n" "> \n" "> .\n" ">\n" "\n" "\n" "Thanks!\n" - Zhou Wang + "Zhou Wang\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 -5b08adab675436f8a1f1de91d7f9e85e3e51c46db368bf76f9d13a6cac55035b +55905200410eb3ab16e2c6f293a6b101629c76483b6ffbdb4c8393f9537d95ee
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.