diff for duplicates of <5356A85F.6030708@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 8ed4b43..a9e4545 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,10 +1,10 @@ [Added MMC maintainers Chris and Ulf for one question below] -On 04/22/2014 10:27 AM, Antoine T?nart wrote: +On 04/22/2014 10:27 AM, Antoine Ténart wrote: > Add the SDHCI nodes for the Marvell Berlin BG2Q, using the mrvl,pxav3-mmc > driver. > -> Signed-off-by: Antoine T?nart <antoine.tenart@free-electrons.com> +> Signed-off-by: Antoine Ténart <antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> > --- > arch/arm/boot/dts/berlin2q.dtsi | 32 ++++++++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) @@ -32,7 +32,7 @@ On 04/22/2014 10:27 AM, Antoine T?nart wrote: > ranges = <0 0xf7000000 0x1000000>; > interrupt-parent = <&gic>; > -> + sdhci0: sdhci at ab0000 { +> + sdhci0: sdhci@ab0000 { > + compatible = "mrvl,pxav3-mmc"; > + reg = <0xab0000 0x200>; > + clocks = <&sdio1clk>; @@ -40,7 +40,7 @@ On 04/22/2014 10:27 AM, Antoine T?nart wrote: > + status = "disabled"; > + }; > + -> + sdhci1: sdhci at ab0800 { +> + sdhci1: sdhci@ab0800 { > + compatible = "mrvl,pxav3-mmc"; > + reg = <0xab0800 0x200>; > + clocks = <&sdio1clk>; @@ -48,7 +48,7 @@ On 04/22/2014 10:27 AM, Antoine T?nart wrote: > + status = "disabled"; > + }; > + -> + sdhci2: sdhci at ab1000 { +> + sdhci2: sdhci@ab1000 { Didn't Jisheng ask for sdhci2 being registered at mmc0? Renaming the node labels will not help, but have you tried using an: @@ -74,7 +74,12 @@ Sebastian > + status = "disabled"; > + }; > + -> l2: l2-cache-controller at ac0000 { +> l2: l2-cache-controller@ac0000 { > compatible = "arm,pl310-cache"; > reg = <0xac0000 0x1000>; -> +> + +-- +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/N1/content_digest index a42cc2b..3d408cc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,27 @@ "ref\01398155248-1659-1-git-send-email-antoine.tenart@free-electrons.com\0" "ref\01398155248-1659-2-git-send-email-antoine.tenart@free-electrons.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH v2 1/2] ARM: dts: berlin: add the SDHCI nodes for the BG2Q\0" + "ref\01398155248-1659-2-git-send-email-antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH v2 1/2] ARM: dts: berlin: add the SDHCI nodes for the BG2Q\0" "Date\0Tue, 22 Apr 2014 19:35:27 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Antoine T\303\251nart <antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Cc\0alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org" + zmxu-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org + jszhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Chris Ball <chris-OsFVWbfNK3isTnJN9+BGXg@public.gmane.org> + " Ulf Hansson <ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" "\00:1\0" "b\0" "[Added MMC maintainers Chris and Ulf for one question below]\n" "\n" - "On 04/22/2014 10:27 AM, Antoine T?nart wrote:\n" + "On 04/22/2014 10:27 AM, Antoine T\303\203\302\251nart wrote:\n" "> Add the SDHCI nodes for the Marvell Berlin BG2Q, using the mrvl,pxav3-mmc\n" "> driver.\n" "> \n" - "> Signed-off-by: Antoine T?nart <antoine.tenart@free-electrons.com>\n" + "> Signed-off-by: Antoine T\303\203\302\251nart <antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" "> ---\n" "> arch/arm/boot/dts/berlin2q.dtsi | 32 ++++++++++++++++++++++++++++++++\n" "> 1 file changed, 32 insertions(+)\n" @@ -40,7 +49,7 @@ "> \t\tranges = <0 0xf7000000 0x1000000>;\n" "> \t\tinterrupt-parent = <&gic>;\n" "> \n" - "> +\t\tsdhci0: sdhci at ab0000 {\n" + "> +\t\tsdhci0: sdhci@ab0000 {\n" "> +\t\t\tcompatible = \"mrvl,pxav3-mmc\";\n" "> +\t\t\treg = <0xab0000 0x200>;\n" "> +\t\t\tclocks = <&sdio1clk>;\n" @@ -48,7 +57,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tsdhci1: sdhci at ab0800 {\n" + "> +\t\tsdhci1: sdhci@ab0800 {\n" "> +\t\t\tcompatible = \"mrvl,pxav3-mmc\";\n" "> +\t\t\treg = <0xab0800 0x200>;\n" "> +\t\t\tclocks = <&sdio1clk>;\n" @@ -56,7 +65,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tsdhci2: sdhci at ab1000 {\n" + "> +\t\tsdhci2: sdhci@ab1000 {\n" "\n" "Didn't Jisheng ask for sdhci2 being registered at mmc0?\n" "Renaming the node labels will not help, but have you tried using an:\n" @@ -82,9 +91,14 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tl2: l2-cache-controller at ac0000 {\n" + "> \t\tl2: l2-cache-controller@ac0000 {\n" "> \t\t\tcompatible = \"arm,pl310-cache\";\n" "> \t\t\treg = <0xac0000 0x1000>;\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 -bb3166db5e48821013d4494e51239e8f5bed3aef53a29fbf3b08e275195c5bb9 +d296fd99cc5664dac6dd5c4035bcb876b5f8f556a7e1c924553d03d69ad49242
diff --git a/a/1.txt b/N2/1.txt index 8ed4b43..6ca0aad 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,10 +1,10 @@ [Added MMC maintainers Chris and Ulf for one question below] -On 04/22/2014 10:27 AM, Antoine T?nart wrote: +On 04/22/2014 10:27 AM, Antoine Ténart wrote: > Add the SDHCI nodes for the Marvell Berlin BG2Q, using the mrvl,pxav3-mmc > driver. > -> Signed-off-by: Antoine T?nart <antoine.tenart@free-electrons.com> +> Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> > --- > arch/arm/boot/dts/berlin2q.dtsi | 32 ++++++++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) @@ -32,7 +32,7 @@ On 04/22/2014 10:27 AM, Antoine T?nart wrote: > ranges = <0 0xf7000000 0x1000000>; > interrupt-parent = <&gic>; > -> + sdhci0: sdhci at ab0000 { +> + sdhci0: sdhci@ab0000 { > + compatible = "mrvl,pxav3-mmc"; > + reg = <0xab0000 0x200>; > + clocks = <&sdio1clk>; @@ -40,7 +40,7 @@ On 04/22/2014 10:27 AM, Antoine T?nart wrote: > + status = "disabled"; > + }; > + -> + sdhci1: sdhci at ab0800 { +> + sdhci1: sdhci@ab0800 { > + compatible = "mrvl,pxav3-mmc"; > + reg = <0xab0800 0x200>; > + clocks = <&sdio1clk>; @@ -48,7 +48,7 @@ On 04/22/2014 10:27 AM, Antoine T?nart wrote: > + status = "disabled"; > + }; > + -> + sdhci2: sdhci at ab1000 { +> + sdhci2: sdhci@ab1000 { Didn't Jisheng ask for sdhci2 being registered at mmc0? Renaming the node labels will not help, but have you tried using an: @@ -74,7 +74,7 @@ Sebastian > + status = "disabled"; > + }; > + -> l2: l2-cache-controller at ac0000 { +> l2: l2-cache-controller@ac0000 { > compatible = "arm,pl310-cache"; > reg = <0xac0000 0x1000>; > diff --git a/a/content_digest b/N2/content_digest index a42cc2b..c4184c9 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,18 +1,26 @@ "ref\01398155248-1659-1-git-send-email-antoine.tenart@free-electrons.com\0" "ref\01398155248-1659-2-git-send-email-antoine.tenart@free-electrons.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH v2 1/2] ARM: dts: berlin: add the SDHCI nodes for the BG2Q\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [PATCH v2 1/2] ARM: dts: berlin: add the SDHCI nodes for the BG2Q\0" "Date\0Tue, 22 Apr 2014 19:35:27 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Antoine T\303\251nart <antoine.tenart@free-electrons.com>\0" + "Cc\0alexandre.belloni@free-electrons.com" + zmxu@marvell.com + jszhang@marvell.com + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + Chris Ball <chris@printf.net> + " Ulf Hansson <ulf.hansson@linaro.org>\0" "\00:1\0" "b\0" "[Added MMC maintainers Chris and Ulf for one question below]\n" "\n" - "On 04/22/2014 10:27 AM, Antoine T?nart wrote:\n" + "On 04/22/2014 10:27 AM, Antoine T\303\251nart wrote:\n" "> Add the SDHCI nodes for the Marvell Berlin BG2Q, using the mrvl,pxav3-mmc\n" "> driver.\n" "> \n" - "> Signed-off-by: Antoine T?nart <antoine.tenart@free-electrons.com>\n" + "> Signed-off-by: Antoine T\303\251nart <antoine.tenart@free-electrons.com>\n" "> ---\n" "> arch/arm/boot/dts/berlin2q.dtsi | 32 ++++++++++++++++++++++++++++++++\n" "> 1 file changed, 32 insertions(+)\n" @@ -40,7 +48,7 @@ "> \t\tranges = <0 0xf7000000 0x1000000>;\n" "> \t\tinterrupt-parent = <&gic>;\n" "> \n" - "> +\t\tsdhci0: sdhci at ab0000 {\n" + "> +\t\tsdhci0: sdhci@ab0000 {\n" "> +\t\t\tcompatible = \"mrvl,pxav3-mmc\";\n" "> +\t\t\treg = <0xab0000 0x200>;\n" "> +\t\t\tclocks = <&sdio1clk>;\n" @@ -48,7 +56,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tsdhci1: sdhci at ab0800 {\n" + "> +\t\tsdhci1: sdhci@ab0800 {\n" "> +\t\t\tcompatible = \"mrvl,pxav3-mmc\";\n" "> +\t\t\treg = <0xab0800 0x200>;\n" "> +\t\t\tclocks = <&sdio1clk>;\n" @@ -56,7 +64,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tsdhci2: sdhci at ab1000 {\n" + "> +\t\tsdhci2: sdhci@ab1000 {\n" "\n" "Didn't Jisheng ask for sdhci2 being registered at mmc0?\n" "Renaming the node labels will not help, but have you tried using an:\n" @@ -82,9 +90,9 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tl2: l2-cache-controller at ac0000 {\n" + "> \t\tl2: l2-cache-controller@ac0000 {\n" "> \t\t\tcompatible = \"arm,pl310-cache\";\n" "> \t\t\treg = <0xac0000 0x1000>;\n" > -bb3166db5e48821013d4494e51239e8f5bed3aef53a29fbf3b08e275195c5bb9 +e8d221d567ceb942f47bd8fe2b577465d42feffc4b62fbb1ef8cb4e1bfeedfd0
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.