| Message ID | 1353921525-25163-1-git-send-email-sebastian.hesselbarth@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Nov 26, 2012 at 10:18 AM, Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> wrote: > During merge of the mvebu patches a clock gate for pinctrl was > lost. This patch just readds the clock gate. > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> So who's supposed to merge this patch? Me? The MVEBU-maintainer? Yours, Linus Walleij
On Sat, Dec 01, 2012 at 06:07:06PM +0100, Linus Walleij wrote: > On Mon, Nov 26, 2012 at 10:18 AM, Sebastian Hesselbarth > <sebastian.hesselbarth@gmail.com> wrote: > > > During merge of the mvebu patches a clock gate for pinctrl was > > lost. This patch just readds the clock gate. > > > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > > Acked-by: Linus Walleij <linus.walleij@linaro.org> > > So who's supposed to merge this patch? Me? The MVEBU-maintainer? I'll take it and merge it in once v3.8-rc1 drops. thx, Jason.
On 12/01/2012 07:13 PM, Jason Cooper wrote: > On Sat, Dec 01, 2012 at 06:07:06PM +0100, Linus Walleij wrote: >> On Mon, Nov 26, 2012 at 10:18 AM, Sebastian Hesselbarth >> <sebastian.hesselbarth@gmail.com> wrote: >> >>> During merge of the mvebu patches a clock gate for pinctrl was >>> lost. This patch just readds the clock gate. >>> >>> Signed-off-by: Sebastian Hesselbarth<sebastian.hesselbarth@gmail.com> >> >> Acked-by: Linus Walleij<linus.walleij@linaro.org> >> >> So who's supposed to merge this patch? Me? The MVEBU-maintainer? > > I'll take it and merge it in once v3.8-rc1 drops. Linus, Jason, I agree to take it through Jason's tree but please take v2 of the patch as there has been a small change in one of the patches. Sebastian
On Sat, Dec 01, 2012 at 07:15:55PM +0100, Sebastian Hesselbarth wrote: > On 12/01/2012 07:13 PM, Jason Cooper wrote: > >On Sat, Dec 01, 2012 at 06:07:06PM +0100, Linus Walleij wrote: > >>On Mon, Nov 26, 2012 at 10:18 AM, Sebastian Hesselbarth > >><sebastian.hesselbarth@gmail.com> wrote: > >> > >>>During merge of the mvebu patches a clock gate for pinctrl was > >>>lost. This patch just readds the clock gate. > >>> > >>>Signed-off-by: Sebastian Hesselbarth<sebastian.hesselbarth@gmail.com> > >> > >>Acked-by: Linus Walleij<linus.walleij@linaro.org> > >> > >>So who's supposed to merge this patch? Me? The MVEBU-maintainer? > > > >I'll take it and merge it in once v3.8-rc1 drops. > > Linus, Jason, > > I agree to take it through Jason's tree but please take v2 of > the patch as there has been a small change in one of the patches. Yes, I have it flagged. thx, Jason.
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index f3f7e9d..42eac1f 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -117,6 +117,7 @@ pinctrl: pinctrl@d0200 { compatible = "marvell,dove-pinctrl"; reg = <0xd0200 0x10>; + clocks = <&gate_clk 22>; }; spi0: spi@10600 {
During merge of the mvebu patches a clock gate for pinctrl was lost. This patch just readds the clock gate. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> --- Cc: Jason Cooper <jason@lakedaemon.net> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Gregory CLEMENT <gregory.clement@free-electrons.com> Cc: Axel Lin <axel.lin@ingics.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org --- arch/arm/boot/dts/dove.dtsi | 1 + 1 file changed, 1 insertion(+)