From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
To: Jason Cooper <jason@lakedaemon.net>,
Linus Walleij <linus.walleij@linaro.org>,
Sebastian Hesselbarth <sebastian.hesselbarth@googlemail.com>
Cc: Mark Rutland <mark.rutland@arm.com>, Andrew Lunn <andrew@lunn.ch>,
Russell King <linux@arm.linux.org.uk>,
Pawel Moll <pawel.moll@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
"linux-doc@vger.kernel.org" <linux-doc@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
Rob Herring <robh+dt@kernel.org>, Rob Landley <rob@landley.net>,
Kumar Gala <galak@codeaurora.org>,
Gregory Clement <gregory.clement@free-electrons.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Subject: Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl
Date: Tue, 25 Feb 2014 16:30:45 +0100 [thread overview]
Message-ID: <530CB725.5070904@gmail.com> (raw)
In-Reply-To: <20140225151656.GI1010@titan.lakedaemon.net>
On 02/25/14 16:16, Jason Cooper wrote:
> On Tue, Feb 25, 2014 at 10:36:54AM +0100, Linus Walleij wrote:
>> On Mon, Feb 24, 2014 at 7:10 PM, Jason Cooper <jason@lakedaemon.net> wrote:
>>> I've now created mvebu/pinctrl-dove for this series. It's based on
>>> v3.14-rc1, and depends on mvebu/pinctrl (which depends on
>>> mvebu/pinctrl-3xx).
>>>
>>> I've kept this series in a separate branch in case we encounter an
>>> unforeseen problem with something in here. Then this branch can be
>>> dropped, and /pinctrl-3xx and /pinctrl will still make it in.
>>>
>>> So, all patches except 3 and 4 are in mvebu/pinctrl-dove. 3 and 4 are
>>> in mvebu/dt.
>>
>> OK so what should I be pulling in first now?
>
> Of course I woke up this morning not happy with this :-/ Here's what it
> looks like currently:
>
> /v3.14-rc1
> |
> --+---+---+---+---+ mvebu/pinctrl-3xx
> | \
> |---+---+---+---+---+---+---+ mvebu/pinctrl
> \ \
> \---------------------------+---+---+---+ mvebu/pinctrl-dove
>
> Not to scale.
>
>
> I would prefer to do:
>
> /v3.14-rc1
> |
> --+---+---+---+---+ mvebu/pinctrl-cleanup
> | \
> |----------------+--+---+---+ mvebu/pinctrl-3xx
> \ \
> \----------------+---+---+--+---+---+---+ mvebu/pinctrl-dove
>
> But this would mean moving some patches to branches other than what they
> were sent with. The advantage is that /pinctrl-3xx and /pinctrl-dove
> don't depend on each other, and only depend on -cleanup. Which is great
> if there is something wrong in either branch.
>
> Sebastian, I can cherry-pick the patches around, but you know the code
> better than any of us, do you foresee any problems with this scenario?
If Thomas agrees, I can rework Armada 375/38x pinctrl stubs to fit on
mvebu/pinctrl. That should allow you to have mvebu/pinctrl-dove
independent of mvebu/pinctrl-3xx.
Not a big deal, I'd just pick 375/38x patches from mvebu/pinctrl and
squash them into mvebu/pinctrl-3xx. The only "issue" is that DT
documentation update patches from mvebu/pinctrl-dove have to be split
too.
I'll prepare the three new branches for you and Thomas to look at
today.
Sebastian
next prev parent reply other threads:[~2014-02-25 15:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-24 8:42 [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl Sebastian Hesselbarth
2014-02-24 8:42 ` [PATCH 01/10] devicetree: bindings: add missing Marvell Dove SoC documentation Sebastian Hesselbarth
2014-02-24 8:42 ` [PATCH 02/10] devicetree: bindings: update MVEBU pinctrl binding documentation Sebastian Hesselbarth
2014-02-24 8:42 ` [PATCH 03/10] ARM: dove: add additional pinctrl registers Sebastian Hesselbarth
2014-02-24 8:42 ` [PATCH 04/10] ARM: dove: add global-config register node Sebastian Hesselbarth
2014-02-24 10:17 ` [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl Linus Walleij
2014-02-24 10:20 ` Sebastian Hesselbarth
[not found] ` <530B1CF4.2060208-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-02-24 11:50 ` Linus Walleij
[not found] ` <1393231382-11078-1-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-02-24 18:10 ` Jason Cooper
[not found] ` <20140224181023.GA1010-u4khhh1J0LxI1Ri9qeTfzeTW4wlIGRCZ@public.gmane.org>
2014-02-25 9:36 ` Linus Walleij
2014-02-25 15:16 ` Jason Cooper
2014-02-25 15:30 ` Sebastian Hesselbarth [this message]
2014-02-25 15:43 ` Jason Cooper
[not found] ` <CACRpkdZ+YGTyDj6i8c198MdRtz3GY-YBmVO9LysPCcmT4EC0cg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-02-26 0:09 ` Jason Cooper
2014-02-26 9:43 ` Linus Walleij
[not found] ` <CACRpkdYQa2BG_qxf5zY=7rks6O31ZF-BX0af3_u1MOgwfwxFSQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-02-26 14:53 ` Jason Cooper
2014-03-07 1:26 ` Linus Walleij
2014-03-07 2:16 ` Jason Cooper
2014-03-07 2:57 ` Yoshiyuki Ito
2014-03-07 3:03 ` Jason Cooper
2014-03-07 3:08 ` YOSHIYUKI ITO
2014-03-07 3:47 ` Jason Cooper
2014-03-07 3:54 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=530CB725.5070904@gmail.com \
--to=sebastian.hesselbarth@gmail.com \
--cc=andrew@lunn.ch \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=gregory.clement@free-electrons.com \
--cc=ijc+devicetree@hellion.org.uk \
--cc=jason@lakedaemon.net \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=rob@landley.net \
--cc=robh+dt@kernel.org \
--cc=sebastian.hesselbarth@googlemail.com \
--cc=thomas.petazzoni@free-electrons.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).