From: khilman@baylibre.com (Kevin Hilman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2] pinctrl: amlogic: Add support for Amlogic Meson GXBB SoC
Date: Sun, 01 May 2016 16:48:51 -0700 [thread overview]
Message-ID: <m2y47tuyos.fsf@baylibre.com> (raw)
In-Reply-To: <CAOQ7t2YEVsk9cB-kmp-fXSVsVVtXynFbMSxPzTPE_0+s0qY9PQ@mail.gmail.com> (Carlo Caione's message of "Sun, 1 May 2016 11:20:14 +0200")
Carlo Caione <carlo@caione.org> writes:
> On Sun, May 1, 2016 at 11:03 AM, Linus Walleij <linus.walleij@linaro.org> wrote:
>> On Sat, Apr 30, 2016 at 7:21 PM, Carlo Caione <carlo@caione.org> wrote:
>>
>>> From: Carlo Caione <carlo@endlessm.com>
>>>
>>> This patch adds the basic platform file to support the pin controller
>>> found on the Amlogic Meson GXBB SoCs.
>>>
>>> Signed-off-by: Carlo Caione <carlo@endlessm.com>
>>
>>> .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 +
>>
>> This thing conflicts with upstream. Make a separate patch for
>> updating the bindings I think.
>
> This patch is based on linux-next where the documentation is correctly
> updated (see 11ca8735) but apparently this is missing from upstream.
> Probably slipped through the cracks with the latest PR.
>
> Kevin, did you merge both the commits in
> https://patchwork.ozlabs.org/patch/603580/ or just the DT changes?
Yes, I just pulled your branch.
That pull was merged for v4.7, which is why it's in next, but not yet
mainline (where v4.6 is just now being finalized.)
Kevin
WARNING: multiple messages have this Message-ID (diff)
From: Kevin Hilman <khilman-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
To: Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>
Cc: "Linus Walleij"
<linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
"Rob Herring" <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>,
linux-meson <linux-meson-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org>,
"devicetree@vger.kernel.org"
<devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
"Andreas Färber" <afaerber-l3A5Bk7waGM@public.gmane.org>,
"Arnd Bergmann" <arnd-r2nGTMty4D4@public.gmane.org>,
linux-6IF/jdPJHihWk0Htik3J/w@public.gmane.org,
"Carlo Caione" <carlo-6IF/jdPJHihWk0Htik3J/w@public.gmane.org>
Subject: Re: [PATCH 1/2] pinctrl: amlogic: Add support for Amlogic Meson GXBB SoC
Date: Sun, 01 May 2016 16:48:51 -0700 [thread overview]
Message-ID: <m2y47tuyos.fsf@baylibre.com> (raw)
In-Reply-To: <CAOQ7t2YEVsk9cB-kmp-fXSVsVVtXynFbMSxPzTPE_0+s0qY9PQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> (Carlo Caione's message of "Sun, 1 May 2016 11:20:14 +0200")
Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org> writes:
> On Sun, May 1, 2016 at 11:03 AM, Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> wrote:
>> On Sat, Apr 30, 2016 at 7:21 PM, Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org> wrote:
>>
>>> From: Carlo Caione <carlo-6IF/jdPJHihWk0Htik3J/w@public.gmane.org>
>>>
>>> This patch adds the basic platform file to support the pin controller
>>> found on the Amlogic Meson GXBB SoCs.
>>>
>>> Signed-off-by: Carlo Caione <carlo-6IF/jdPJHihWk0Htik3J/w@public.gmane.org>
>>
>>> .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 +
>>
>> This thing conflicts with upstream. Make a separate patch for
>> updating the bindings I think.
>
> This patch is based on linux-next where the documentation is correctly
> updated (see 11ca8735) but apparently this is missing from upstream.
> Probably slipped through the cracks with the latest PR.
>
> Kevin, did you merge both the commits in
> https://patchwork.ozlabs.org/patch/603580/ or just the DT changes?
Yes, I just pulled your branch.
That pull was merged for v4.7, which is why it's in next, but not yet
mainline (where v4.6 is just now being finalized.)
Kevin
--
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
next prev parent reply other threads:[~2016-05-01 23:48 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-30 17:21 [PATCH 0/2] amlogic: GXBB: Add pin controller Carlo Caione
2016-04-30 17:21 ` Carlo Caione
2016-04-30 17:21 ` [PATCH 1/2] pinctrl: amlogic: Add support for Amlogic Meson GXBB SoC Carlo Caione
2016-04-30 17:21 ` Carlo Caione
2016-05-01 9:03 ` Linus Walleij
2016-05-01 9:03 ` Linus Walleij
2016-05-01 9:20 ` Carlo Caione
2016-05-01 9:20 ` Carlo Caione
2016-05-01 23:48 ` Kevin Hilman [this message]
2016-05-01 23:48 ` Kevin Hilman
2016-04-30 17:21 ` [PATCH 2/2] ARM64: dts: amlogic: Enable pin controller on GXBB-based platforms Carlo Caione
2016-04-30 17:21 ` Carlo Caione
2016-05-01 9:05 ` Linus Walleij
2016-05-01 9:05 ` 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=m2y47tuyos.fsf@baylibre.com \
--to=khilman@baylibre.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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 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.