| Message ID | 2d89fbc10d07c890336eabbd362e55cb2e5055b5.1496413293.git-series.gregory.clement@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jun 2, 2017 at 4:23 PM, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote: > Document the device tree binding for the pin controllers found on the > Armada 7K and Armada 8K SoCs. > > Acked-by: Rob Herring <robh@kernel.org> > Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> This patch does not apply to any of my branches, I have no clue what tree you're basing this on. I would prefer a series based on a pure v4.12-rc2 I think, as this is what both the pin control and GPIO development branches is based on, unless you have a better merge strategy to suggest? I hope for the love of god that this does not also clash with the PWM stuff that is patching around in the GPIO tree, if it does I might very well throw up my hands and defer merging all of this until the next kernel cycle past v4.13-rc1. Please rebase on v4.12-rc2 and resend. Yours, Linus Walleij
Hi Linus, On ven., juin 09 2017, Linus Walleij <linus.walleij@linaro.org> wrote: > On Fri, Jun 2, 2017 at 4:23 PM, Gregory CLEMENT > <gregory.clement@free-electrons.com> wrote: > >> Document the device tree binding for the pin controllers found on the >> Armada 7K and Armada 8K SoCs. >> >> Acked-by: Rob Herring <robh@kernel.org> >> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> > > This patch does not apply to any of my branches, I have no clue > what tree you're basing this on. > > I would prefer a series based on a pure v4.12-rc2 I think, as this > is what both the pin control and GPIO development branches > is based on, unless you have a better merge strategy to suggest? As I wrote in the cover letter : "The patch modifying the documentation still depend on the ones of the clk series. For the ap806 a first stable branch is already available: https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/log/?h=clk-ap806" In the previous version of the series the clk maintainer said they will provide stable branch for the documentation. For ap806 it is already done, but not yet for cp110. But if you still have problem with it Rob offer to take care of the devie tree documentation. Just let us know what you prefer. > > I hope for the love of god that this does not also clash with the > PWM stuff that is patching around in the GPIO tree, if it does > I might very well throw up my hands and defer merging all of > this until the next kernel cycle past v4.13-rc1. To avoid this kind of issues the series are based on next-20170531 in order to have in the same time the devel branch of the linux-gpio tree and the devel branch of the linux-pinctrl tree. > > Please rebase on v4.12-rc2 and resend. I use the linux-next tree because you already picked up some patches of my first series and applied it on your devel branches. If I rebased on v4;12-rc2, obviously it won't work. So really basing the series on your devel branch is the best thing to do. I saw that you already applied the PWM patch so as soon as they were visible on the devel branches I will rebased the series on it and submit it a new version. Thanks, Gregory > > Yours, > Linus Walleij
On Fri, Jun 9, 2017 at 10:07 AM, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote: > As I wrote in the cover letter : > "The patch modifying the documentation still depend on the ones of the > clk series. For the ap806 a first stable branch is already available: > https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/log/?h=clk-ap806" Sorry I may miss things like that... usually it is better if patches that depend on each other for merging are in the same series. > In the previous version of the series the clk maintainer said they will > provide stable branch for the documentation. For ap806 it is already > done, but not yet for cp110. But if you still have problem with it Rob > offer to take care of the devie tree documentation. > > Just let us know what you prefer. I don't understand. Tell me what I need to do or we can just wait a kernel cycle before merging this I guess. Either I need an immutable branch or I merge the clock patches I guess. Neither is very good but I'm open to compromises. >> I hope for the love of god that this does not also clash with the >> PWM stuff that is patching around in the GPIO tree, if it does >> I might very well throw up my hands and defer merging all of >> this until the next kernel cycle past v4.13-rc1. > > To avoid this kind of issues the series are based on next-20170531 in > order to have in the same time the devel branch of the linux-gpio tree > and the devel branch of the linux-pinctrl tree. I see. Well if nothing else works, we just defer. > I use the linux-next tree because you already picked up some patches of > my first series and applied it on your devel branches. If I rebased on > v4;12-rc2, obviously it won't work. So really basing the series on your > devel branch is the best thing to do. Indeed, sorry, the left hand doesn't know what the right hand is doing sometimes. > I saw that you already applied the PWM patch so as soon as they were > visible on the devel branches I will rebased the series on it and submit > it a new version. OK Yours, Linus Walleij
diff --git a/Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt b/Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt index 888c50e0d64f..4228d158fb31 100644 --- a/Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt +++ b/Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt @@ -28,14 +28,53 @@ Required properties: - compatible: must be: "marvell,ap806-clock" - #clock-cells: must be set to 1 +Pinctrl: +-------- + +For common binding part and usage, refer to +Documentation/devicetree/bindings/pinctrl/marvell,mvebu-pinctrl.txt. + +Required properties: +- compatible must be "marvell,ap806-pinctrl", + +Available mpp pins/groups and functions: +Note: brackets (x) are not part of the mpp name for marvell,function and given +only for more detailed description in this document. + +name pins functions +================================================================================ +mpp0 0 gpio, sdio(clk), spi0(clk) +mpp1 1 gpio, sdio(cmd), spi0(miso) +mpp2 2 gpio, sdio(d0), spi0(mosi) +mpp3 3 gpio, sdio(d1), spi0(cs0n) +mpp4 4 gpio, sdio(d2), i2c0(sda) +mpp5 5 gpio, sdio(d3), i2c0(sdk) +mpp6 6 gpio, sdio(ds) +mpp7 7 gpio, sdio(d4), uart1(rxd) +mpp8 8 gpio, sdio(d5), uart1(txd) +mpp9 9 gpio, sdio(d6), spi0(cs1n) +mpp10 10 gpio, sdio(d7) +mpp11 11 gpio, uart0(txd) +mpp12 12 gpio, sdio(pw_off), sdio(hw_rst) +mpp13 13 gpio +mpp14 14 gpio +mpp15 15 gpio +mpp16 16 gpio +mpp17 17 gpio +mpp18 18 gpio +mpp19 19 gpio, uart0(rxd), sdio(pw_off) + Example: +ap_syscon: system-controller@6f4000 { + compatible = "syscon", "simple-mfd"; + reg = <0x6f4000 0x1000>; - syscon: system-controller@6f4000 { - compatible = "syscon", "simple-mfd"; - reg = <0x6f4000 0x1000>; + ap_clk: clock { + compatible = "marvell,ap806-clock"; + #clock-cells = <1>; + }; - ap_clk: clock { - compatible = "marvell,ap806-clock"; - #clock-cells = <1>; - }; + ap_pinctrl: pinctrl { + compatible = "marvell,ap806-pinctrl"; }; +};