diff for duplicates of <535B81B0.8020302@gmail.com> diff --git a/a/1.txt b/N1/1.txt index f1bb03c..fa59048 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,8 +1,8 @@ -On 04/23/2014 05:51 PM, Antoine T?nart wrote: +On 04/23/2014 05:51 PM, Antoine Ténart wrote: > The uart0 pinmux configuration is in the dtsi because uart0 will always > use uart0-pmux to work, no other possibility. Same thing for uart1. > -> 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/berlin2.dtsi | 24 ++++++++++++++++++++++++ > arch/arm/boot/dts/berlin2cd.dtsi | 17 +++++++++++++++++ @@ -17,19 +17,19 @@ On 04/23/2014 05:51 PM, Antoine T?nart wrote: > }; > }; > -> + soc_pinctrl: pin-controller at ea0000 { +> + soc_pinctrl: pin-controller@ea0000 { > + compatible = "marvell,berlin2-soc-pinctrl"; > + reg = <0xea0000 0x4c>; > + }; > + -> apb at fc0000 { +> apb@fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -184,6 +189,21 @@ > ranges = <0 0xfc0000 0x10000>; > interrupt-parent = <&sic>; > -> + sm_pinctrl: pin-controller at 0000 { +> + sm_pinctrl: pin-controller@0000 { > + compatible = "marvell,berlin2-sysmgr-pinctrl"; > + reg = <0x0000 0x44>; > + @@ -59,7 +59,7 @@ Sebastian > + }; > + -> uart0: serial at 9000 { +> uart0: serial@9000 { > compatible = "snps,dw-apb-uart"; > reg = <0x9000 0x100>; > @@ -191,6 +211,8 @@ @@ -88,19 +88,19 @@ Sebastian > }; > }; > -> + soc_pinctrl: pin-controller at ae0000 { +> + soc_pinctrl: pin-controller@ae0000 { > + compatible = "marvell,berlin2cd-soc-pinctrl"; > + reg = <0xea0000 0x4c>; > + }; > + -> apb at fc0000 { +> apb@fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -177,6 +182,16 @@ > ranges = <0 0xfc0000 0x10000>; > interrupt-parent = <&sic>; > -> + sm_pinctrl: pin-controller at 0000 { +> + sm_pinctrl: pin-controller@0000 { > + compatible = "marvell,berlin2cd-sysmgr-pinctrl"; > + reg = <0x0000 0x44>; > + @@ -110,7 +110,7 @@ Sebastian > + }; > + }; > + -> uart0: serial at 9000 { +> uart0: serial@9000 { > compatible = "snps,dw-apb-uart"; > reg = <0x9000 0x100>; > @@ -184,6 +199,8 @@ @@ -130,12 +130,12 @@ Sebastian > }; > }; > -> + soc_pinctrl: pin-controller at ea0000 { +> + soc_pinctrl: pin-controller@ea0000 { > + compatible = "marvell,berlin2q-soc-pinctrl"; > + reg = <0xea0000 0x4c>; > + }; > + -> apb at fc0000 { +> apb@fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -198,6 +203,8 @@ @@ -156,7 +156,7 @@ Sebastian > status = "disabled"; > }; > -> + sm_pinctrl: pin-controller at d000 { +> + sm_pinctrl: pin-controller@d000 { > + compatible = "marvell,berlin2q-sysmgr-pinctrl"; > + reg = <0xd000 0x44>; > + @@ -171,7 +171,13 @@ Sebastian > + }; > + }; > + -> sic: interrupt-controller at e000 { +> sic: interrupt-controller@e000 { > compatible = "snps,dw-apb-ictl"; > reg = <0xe000 0x30>; -> +> + + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N1/content_digest index 5685746..63bda29 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,23 @@ "ref\01398268276-9696-1-git-send-email-antoine.tenart@free-electrons.com\0" "ref\01398268276-9696-8-git-send-email-antoine.tenart@free-electrons.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH v2 7/7] ARM: dts: berlin: add the pinctrl node and muxing setup for uarts\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [PATCH v2 7/7] ARM: dts: berlin: add the pinctrl node and muxing setup for uarts\0" "Date\0Sat, 26 Apr 2014 11:51:44 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Antoine T\303\251nart <antoine.tenart@free-electrons.com>" + " linus.walleij@linaro.org\0" + "Cc\0zmxu@marvell.com" + jszhang@marvell.com + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + alexandre.belloni@free-electrons.com + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "On 04/23/2014 05:51 PM, Antoine T?nart wrote:\n" + "On 04/23/2014 05:51 PM, Antoine T\303\251nart wrote:\n" "> The uart0 pinmux configuration is in the dtsi because uart0 will always\n" "> use uart0-pmux to work, no other possibility. Same thing for uart1.\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/berlin2.dtsi | 24 ++++++++++++++++++++++++\n" "> arch/arm/boot/dts/berlin2cd.dtsi | 17 +++++++++++++++++\n" @@ -25,19 +32,19 @@ "> \t\t\t};\n" "> \t\t};\n" "> \n" - "> +\t\tsoc_pinctrl: pin-controller at ea0000 {\n" + "> +\t\tsoc_pinctrl: pin-controller@ea0000 {\n" "> +\t\t\tcompatible = \"marvell,berlin2-soc-pinctrl\";\n" "> +\t\t\treg = <0xea0000 0x4c>;\n" "> +\t\t};\n" "> +\n" - "> \t\tapb at fc0000 {\n" + "> \t\tapb@fc0000 {\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" "> @@ -184,6 +189,21 @@\n" "> \t\t\tranges = <0 0xfc0000 0x10000>;\n" "> \t\t\tinterrupt-parent = <&sic>;\n" "> \n" - "> +\t\t\tsm_pinctrl: pin-controller at 0000 {\n" + "> +\t\t\tsm_pinctrl: pin-controller@0000 {\n" "> +\t\t\t\tcompatible = \"marvell,berlin2-sysmgr-pinctrl\";\n" "> +\t\t\t\treg = <0x0000 0x44>;\n" "> +\n" @@ -67,7 +74,7 @@ "\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tuart0: serial at 9000 {\n" + "> \t\t\tuart0: serial@9000 {\n" "> \t\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> \t\t\t\treg = <0x9000 0x100>;\n" "> @@ -191,6 +211,8 @@\n" @@ -96,19 +103,19 @@ "> \t\t\t};\n" "> \t\t};\n" "> \n" - "> +\t\tsoc_pinctrl: pin-controller at ae0000 {\n" + "> +\t\tsoc_pinctrl: pin-controller@ae0000 {\n" "> +\t\t\tcompatible = \"marvell,berlin2cd-soc-pinctrl\";\n" "> +\t\t\treg = <0xea0000 0x4c>;\n" "> +\t\t};\n" "> +\n" - "> \t\tapb at fc0000 {\n" + "> \t\tapb@fc0000 {\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" "> @@ -177,6 +182,16 @@\n" "> \t\t\tranges = <0 0xfc0000 0x10000>;\n" "> \t\t\tinterrupt-parent = <&sic>;\n" "> \n" - "> +\t\t\tsm_pinctrl: pin-controller at 0000 {\n" + "> +\t\t\tsm_pinctrl: pin-controller@0000 {\n" "> +\t\t\t\tcompatible = \"marvell,berlin2cd-sysmgr-pinctrl\";\n" "> +\t\t\t\treg = <0x0000 0x44>;\n" "> +\n" @@ -118,7 +125,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tuart0: serial at 9000 {\n" + "> \t\t\tuart0: serial@9000 {\n" "> \t\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> \t\t\t\treg = <0x9000 0x100>;\n" "> @@ -184,6 +199,8 @@\n" @@ -138,12 +145,12 @@ "> \t\t\t};\n" "> \t\t};\n" "> \n" - "> +\t\tsoc_pinctrl: pin-controller at ea0000 {\n" + "> +\t\tsoc_pinctrl: pin-controller@ea0000 {\n" "> +\t\t\tcompatible = \"marvell,berlin2q-soc-pinctrl\";\n" "> +\t\t\treg = <0xea0000 0x4c>;\n" "> +\t\t};\n" "> +\n" - "> \t\tapb at fc0000 {\n" + "> \t\tapb@fc0000 {\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" "> @@ -198,6 +203,8 @@\n" @@ -164,7 +171,7 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tsm_pinctrl: pin-controller at d000 {\n" + "> +\t\t\tsm_pinctrl: pin-controller@d000 {\n" "> +\t\t\t\tcompatible = \"marvell,berlin2q-sysmgr-pinctrl\";\n" "> +\t\t\t\treg = <0xd000 0x44>;\n" "> +\n" @@ -179,9 +186,15 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tsic: interrupt-controller at e000 {\n" + "> \t\t\tsic: interrupt-controller@e000 {\n" "> \t\t\t\tcompatible = \"snps,dw-apb-ictl\";\n" "> \t\t\t\treg = <0xe000 0x30>;\n" - > + "> \n" + "\n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -e69e13a329c3f2286fe76b3d398493a8ec07d30b7eae806f232565f48e9629ce +d6fe671e2aebbca88d3b8b2a5f2d1b756816a3c0de0d19f82e88bc11e6d670c3
diff --git a/a/1.txt b/N2/1.txt index f1bb03c..12432f7 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,8 +1,8 @@ -On 04/23/2014 05:51 PM, Antoine T?nart wrote: +On 04/23/2014 05:51 PM, Antoine Ténart wrote: > The uart0 pinmux configuration is in the dtsi because uart0 will always > use uart0-pmux to work, no other possibility. Same thing for uart1. > -> 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/berlin2.dtsi | 24 ++++++++++++++++++++++++ > arch/arm/boot/dts/berlin2cd.dtsi | 17 +++++++++++++++++ @@ -17,19 +17,19 @@ On 04/23/2014 05:51 PM, Antoine T?nart wrote: > }; > }; > -> + soc_pinctrl: pin-controller at ea0000 { +> + soc_pinctrl: pin-controller@ea0000 { > + compatible = "marvell,berlin2-soc-pinctrl"; > + reg = <0xea0000 0x4c>; > + }; > + -> apb at fc0000 { +> apb@fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -184,6 +189,21 @@ > ranges = <0 0xfc0000 0x10000>; > interrupt-parent = <&sic>; > -> + sm_pinctrl: pin-controller at 0000 { +> + sm_pinctrl: pin-controller@0000 { > + compatible = "marvell,berlin2-sysmgr-pinctrl"; > + reg = <0x0000 0x44>; > + @@ -59,7 +59,7 @@ Sebastian > + }; > + -> uart0: serial at 9000 { +> uart0: serial@9000 { > compatible = "snps,dw-apb-uart"; > reg = <0x9000 0x100>; > @@ -191,6 +211,8 @@ @@ -88,19 +88,19 @@ Sebastian > }; > }; > -> + soc_pinctrl: pin-controller at ae0000 { +> + soc_pinctrl: pin-controller@ae0000 { > + compatible = "marvell,berlin2cd-soc-pinctrl"; > + reg = <0xea0000 0x4c>; > + }; > + -> apb at fc0000 { +> apb@fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -177,6 +182,16 @@ > ranges = <0 0xfc0000 0x10000>; > interrupt-parent = <&sic>; > -> + sm_pinctrl: pin-controller at 0000 { +> + sm_pinctrl: pin-controller@0000 { > + compatible = "marvell,berlin2cd-sysmgr-pinctrl"; > + reg = <0x0000 0x44>; > + @@ -110,7 +110,7 @@ Sebastian > + }; > + }; > + -> uart0: serial at 9000 { +> uart0: serial@9000 { > compatible = "snps,dw-apb-uart"; > reg = <0x9000 0x100>; > @@ -184,6 +199,8 @@ @@ -130,12 +130,12 @@ Sebastian > }; > }; > -> + soc_pinctrl: pin-controller at ea0000 { +> + soc_pinctrl: pin-controller@ea0000 { > + compatible = "marvell,berlin2q-soc-pinctrl"; > + reg = <0xea0000 0x4c>; > + }; > + -> apb at fc0000 { +> apb@fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -198,6 +203,8 @@ @@ -156,7 +156,7 @@ Sebastian > status = "disabled"; > }; > -> + sm_pinctrl: pin-controller at d000 { +> + sm_pinctrl: pin-controller@d000 { > + compatible = "marvell,berlin2q-sysmgr-pinctrl"; > + reg = <0xd000 0x44>; > + @@ -171,7 +171,7 @@ Sebastian > + }; > + }; > + -> sic: interrupt-controller at e000 { +> sic: interrupt-controller@e000 { > compatible = "snps,dw-apb-ictl"; > reg = <0xe000 0x30>; > diff --git a/a/content_digest b/N2/content_digest index 5685746..2128b1a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,23 @@ "ref\01398268276-9696-1-git-send-email-antoine.tenart@free-electrons.com\0" "ref\01398268276-9696-8-git-send-email-antoine.tenart@free-electrons.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH v2 7/7] ARM: dts: berlin: add the pinctrl node and muxing setup for uarts\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [PATCH v2 7/7] ARM: dts: berlin: add the pinctrl node and muxing setup for uarts\0" "Date\0Sat, 26 Apr 2014 11:51:44 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Antoine T\303\251nart <antoine.tenart@free-electrons.com>" + " linus.walleij@linaro.org\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\0" "\00:1\0" "b\0" - "On 04/23/2014 05:51 PM, Antoine T?nart wrote:\n" + "On 04/23/2014 05:51 PM, Antoine T\303\251nart wrote:\n" "> The uart0 pinmux configuration is in the dtsi because uart0 will always\n" "> use uart0-pmux to work, no other possibility. Same thing for uart1.\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/berlin2.dtsi | 24 ++++++++++++++++++++++++\n" "> arch/arm/boot/dts/berlin2cd.dtsi | 17 +++++++++++++++++\n" @@ -25,19 +32,19 @@ "> \t\t\t};\n" "> \t\t};\n" "> \n" - "> +\t\tsoc_pinctrl: pin-controller at ea0000 {\n" + "> +\t\tsoc_pinctrl: pin-controller@ea0000 {\n" "> +\t\t\tcompatible = \"marvell,berlin2-soc-pinctrl\";\n" "> +\t\t\treg = <0xea0000 0x4c>;\n" "> +\t\t};\n" "> +\n" - "> \t\tapb at fc0000 {\n" + "> \t\tapb@fc0000 {\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" "> @@ -184,6 +189,21 @@\n" "> \t\t\tranges = <0 0xfc0000 0x10000>;\n" "> \t\t\tinterrupt-parent = <&sic>;\n" "> \n" - "> +\t\t\tsm_pinctrl: pin-controller at 0000 {\n" + "> +\t\t\tsm_pinctrl: pin-controller@0000 {\n" "> +\t\t\t\tcompatible = \"marvell,berlin2-sysmgr-pinctrl\";\n" "> +\t\t\t\treg = <0x0000 0x44>;\n" "> +\n" @@ -67,7 +74,7 @@ "\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tuart0: serial at 9000 {\n" + "> \t\t\tuart0: serial@9000 {\n" "> \t\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> \t\t\t\treg = <0x9000 0x100>;\n" "> @@ -191,6 +211,8 @@\n" @@ -96,19 +103,19 @@ "> \t\t\t};\n" "> \t\t};\n" "> \n" - "> +\t\tsoc_pinctrl: pin-controller at ae0000 {\n" + "> +\t\tsoc_pinctrl: pin-controller@ae0000 {\n" "> +\t\t\tcompatible = \"marvell,berlin2cd-soc-pinctrl\";\n" "> +\t\t\treg = <0xea0000 0x4c>;\n" "> +\t\t};\n" "> +\n" - "> \t\tapb at fc0000 {\n" + "> \t\tapb@fc0000 {\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" "> @@ -177,6 +182,16 @@\n" "> \t\t\tranges = <0 0xfc0000 0x10000>;\n" "> \t\t\tinterrupt-parent = <&sic>;\n" "> \n" - "> +\t\t\tsm_pinctrl: pin-controller at 0000 {\n" + "> +\t\t\tsm_pinctrl: pin-controller@0000 {\n" "> +\t\t\t\tcompatible = \"marvell,berlin2cd-sysmgr-pinctrl\";\n" "> +\t\t\t\treg = <0x0000 0x44>;\n" "> +\n" @@ -118,7 +125,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tuart0: serial at 9000 {\n" + "> \t\t\tuart0: serial@9000 {\n" "> \t\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> \t\t\t\treg = <0x9000 0x100>;\n" "> @@ -184,6 +199,8 @@\n" @@ -138,12 +145,12 @@ "> \t\t\t};\n" "> \t\t};\n" "> \n" - "> +\t\tsoc_pinctrl: pin-controller at ea0000 {\n" + "> +\t\tsoc_pinctrl: pin-controller@ea0000 {\n" "> +\t\t\tcompatible = \"marvell,berlin2q-soc-pinctrl\";\n" "> +\t\t\treg = <0xea0000 0x4c>;\n" "> +\t\t};\n" "> +\n" - "> \t\tapb at fc0000 {\n" + "> \t\tapb@fc0000 {\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" "> @@ -198,6 +203,8 @@\n" @@ -164,7 +171,7 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tsm_pinctrl: pin-controller at d000 {\n" + "> +\t\t\tsm_pinctrl: pin-controller@d000 {\n" "> +\t\t\t\tcompatible = \"marvell,berlin2q-sysmgr-pinctrl\";\n" "> +\t\t\t\treg = <0xd000 0x44>;\n" "> +\n" @@ -179,9 +186,9 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tsic: interrupt-controller at e000 {\n" + "> \t\t\tsic: interrupt-controller@e000 {\n" "> \t\t\t\tcompatible = \"snps,dw-apb-ictl\";\n" "> \t\t\t\treg = <0xe000 0x30>;\n" > -e69e13a329c3f2286fe76b3d398493a8ec07d30b7eae806f232565f48e9629ce +d48c7aaf9f93bdb5b5a33d1956fd59c344088e9596cc181933af016b11194089
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.