Subject: [PATCH 1/2] pinctrl: amlogic: Add support for Amlogic Meson GXBB SoC

From: [email-masked] (Kevin Hilman)
Date: Sun, 01 May 2016 16:48:51 -0700

Carlo Caione <[email-masked]> writes:

> On Sun, May 1, 2016 at 11:03 AM, Linus Walleij <[email-masked]> wrote:
>> On Sat, Apr 30, 2016 at 7:21 PM, Carlo Caione <[email-masked]> wrote:
>>
>>> From: Carlo Caione <[email-masked]>
>>>
>>> This patch adds the basic platform file to support the pin controller
>>> found on the Amlogic Meson GXBB SoCs.
>>>
>>> Signed-off-by: Carlo Caione <[email-masked]>
>>
>>>  .../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