On Sun, May 1, 2016 at 11:03 AM, Linus Walleij <linus.walleij@xxxxxxxxxx> wrote: > On Sat, Apr 30, 2016 at 7:21 PM, Carlo Caione <carlo@xxxxxxxxxx> wrote: > >> From: Carlo Caione <carlo@xxxxxxxxxxxx> >> >> 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@xxxxxxxxxxxx> > >> .../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? >> arch/arm64/Kconfig.platforms | 2 + > > This needs to be split off and sent separatelt to the ARM64 > maintainers. Since it's just a symbol dependency (I think?) it > can be merged orthogonally. Ok >> drivers/pinctrl/meson/Makefile | 2 +- >> drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 432 +++++++++++++++++++++ >> drivers/pinctrl/meson/pinctrl-meson.c | 8 + >> drivers/pinctrl/meson/pinctrl-meson.h | 2 + >> include/dt-bindings/gpio/meson-gxbb-gpio.h | 154 ++++++++ >> 7 files changed, 601 insertions(+), 1 deletion(-) >> create mode 100644 drivers/pinctrl/meson/pinctrl-meson-gxbb.c >> create mode 100644 include/dt-bindings/gpio/meson-gxbb-gpio.h > > This stuff I can merge, if I get it in a separate patch. I'll split it in v2 >> 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" > > This is not how upstream looks... yeah, trying to figure this out, Thanks, -- Carlo Caione -- 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
