From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Subject: Re: [PATCH 1/2] pinctrl: amlogic: Add support for Amlogic Meson GXBB SoC Date: Sun, 01 May 2016 16:48:51 -0700 Message-ID: References: <1462036875-22625-1-git-send-email-carlo@caione.org> <1462036875-22625-2-git-send-email-carlo@caione.org> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: (Carlo Caione's message of "Sun, 1 May 2016 11:20:14 +0200") Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Carlo Caione Cc: Linus Walleij , Rob Herring , "linux-arm-kernel@lists.infradead.org" , linux-meson , "devicetree@vger.kernel.org" , Andreas =?utf-8?Q?F=C3=A4rber?= , Arnd Bergmann , linux-6IF/jdPJHihWk0Htik3J/w@public.gmane.org, Carlo Caione List-Id: devicetree@vger.kernel.org Carlo Caione writes: > On Sun, May 1, 2016 at 11:03 AM, Linus Walleij wrote: >> On Sat, Apr 30, 2016 at 7:21 PM, Carlo Caione wrote: >> >>> From: Carlo Caione >>> >>> This patch adds the basic platform file to support the pin controller >>> found on the Amlogic Meson GXBB SoCs. >>> >>> Signed-off-by: Carlo Caione >> >>> .../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