On Wed, May 11, 2016 at 1:25 PM, Carlo Caione <carlo@xxxxxxxxxx> wrote: > On Wed, May 11, 2016 at 10:52 AM, Linus Walleij > <linus.walleij@xxxxxxxxxx> wrote: >> On Mon, May 2, 2016 at 10:02 AM, Carlo Caione <carlo@xxxxxxxxxx> wrote: >> >>> From: Carlo Caione <carlo@xxxxxxxxxxxx> >>> >>> Add the two new compatibles for the Amlogic Meson GXBB pin controllers. >>> >>> Signed-off-by: Carlo Caione <carlo@xxxxxxxxxxxx> >>> --- >>> Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 ++ >>> 1 file changed, 2 insertions(+) >>> >>> diff --git a/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt >>> index 32f4a2d..fe7fe0b 100644 >>> --- a/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt >>> +++ b/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt >>> @@ -5,6 +5,8 @@ Required properties for the root node: >>> "amlogic,meson8b-cbus-pinctrl" >>> "amlogic,meson8-aobus-pinctrl" >>> "amlogic,meson8b-aobus-pinctrl" >>> + "amlogic,meson-gxbb-periphs-pinctrl" >>> + "amlogic,meson-gxbb-aobus-pinctrl" >>> - reg: address and size of registers controlling irq functionality >> >> This does NOT apply to the pin control tree because upstream does >> NOT look like this. It looks like that in linux-next however. > > Linus master looks like that > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt Aha so it was merged by some other tree during the release cycle. OK sorry, I was confused. > If you want I can merge it through my tree with the DTS changes. Sure that makes things easier for me, else I need to backmerge the -rc6 or something. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
