diff for duplicates of <20140411081859.GL10240@lunn.ch> diff --git a/a/1.txt b/N1/1.txt index 0489ad4..354d736 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,8 +1,8 @@ -On Thu, Apr 10, 2014 at 03:07:54PM +0200, Antoine T?nart wrote: +On Thu, Apr 10, 2014 at 03:07:54PM +0200, 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 | 20 ++++++++++++++++++++ > arch/arm/boot/dts/berlin2cd.dtsi | 13 +++++++++++++ @@ -17,7 +17,7 @@ On Thu, Apr 10, 2014 at 03:07:54PM +0200, Antoine T?nart wrote: > }; > }; > -> + pinctrl: pinctrl at 0 { +> + pinctrl: pinctrl@0 { > + compatible = "marvell,berlin2-pinctrl"; > + reg = <0xea0000 0x08>, <0xfc0000 0x44>; > + reg-names = "global_base", "apb_base"; diff --git a/a/content_digest b/N1/content_digest index befb9bd..843f212 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,24 @@ "ref\01397135274-10764-1-git-send-email-antoine.tenart@free-electrons.com\0" "ref\01397135274-10764-6-git-send-email-antoine.tenart@free-electrons.com\0" - "From\0andrew@lunn.ch (Andrew Lunn)\0" - "Subject\0[PATCH RESEND 5/5] ARM: dts: berlin: add the pinctrl node and muxing setup for uarts\0" + "From\0Andrew Lunn <andrew@lunn.ch>\0" + "Subject\0Re: [PATCH RESEND 5/5] ARM: dts: berlin: add the pinctrl node and muxing setup for uarts\0" "Date\0Fri, 11 Apr 2014 10:18:59 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Antoine T\303\251nart <antoine.tenart@free-electrons.com>\0" + "Cc\0sebastian.hesselbarth@gmail.com" + linus.walleij@linaro.org + zmxu@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 Thu, Apr 10, 2014 at 03:07:54PM +0200, Antoine T?nart wrote:\n" + "On Thu, Apr 10, 2014 at 03:07:54PM +0200, 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 | 20 ++++++++++++++++++++\n" "> arch/arm/boot/dts/berlin2cd.dtsi | 13 +++++++++++++\n" @@ -25,7 +33,7 @@ "> \t\t\t};\n" "> \t\t};\n" "> \n" - "> +\t\tpinctrl: pinctrl at 0 {\n" + "> +\t\tpinctrl: pinctrl@0 {\n" "> +\t\t\tcompatible = \"marvell,berlin2-pinctrl\";\n" "> +\t\t\treg = <0xea0000 0x08>, <0xfc0000 0x44>;\n" "> +\t\t\treg-names = \"global_base\", \"apb_base\";\n" @@ -59,4 +67,4 @@ "\n" "\tAndrew" -a8cfa08b07819dfb07e2f0434f6121e8bf2a405bed149a0fb02d998543926c32 +e237aa45e961b9e224eac9066f156e3304fbf3c269ec8e29efddaab4decd9a08
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.