| Message ID | 20190805101607.29811-3-miquel.raynal@bootlin.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 2dcf5d9ae9f6d66cd6ccc48ea48939d07b9c7185 |
| Headers | show |
| Series | CP115 pinctrl support | expand |
On Mon, 5 Aug 2019 12:16:06 +0200, Miquel Raynal wrote: > From: Grzegorz Jaszczyk <jaz@semihalf.com> > > A new compatible is going to be used for Armada CP115 pinctrl block, > document it. > > Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com> > [<miquel.raynal@bootlin.com>: split the documentation out of the > driver commit] > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> > --- > .../bindings/arm/marvell/cp110-system-controller.txt | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Reviewed-by: Rob Herring <robh@kernel.org>
On Mon, Aug 5, 2019 at 12:16 PM Miquel Raynal <miquel.raynal@bootlin.com> wrote: > From: Grzegorz Jaszczyk <jaz@semihalf.com> > > A new compatible is going to be used for Armada CP115 pinctrl block, > document it. > > Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com> > [<miquel.raynal@bootlin.com>: split the documentation out of the > driver commit] > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Patch applied with Rob's ACK. Yours, Linus Walleij
diff --git a/Documentation/devicetree/bindings/arm/marvell/cp110-system-controller.txt b/Documentation/devicetree/bindings/arm/marvell/cp110-system-controller.txt index 4db4119a6d19..f982a8ed9396 100644 --- a/Documentation/devicetree/bindings/arm/marvell/cp110-system-controller.txt +++ b/Documentation/devicetree/bindings/arm/marvell/cp110-system-controller.txt @@ -78,8 +78,8 @@ Documentation/devicetree/bindings/pinctrl/marvell,mvebu-pinctrl.txt. Required properties: -- compatible: "marvell,armada-7k-pinctrl", - "marvell,armada-8k-cpm-pinctrl" or "marvell,armada-8k-cps-pinctrl" +- compatible: "marvell,armada-7k-pinctrl", "marvell,armada-8k-cpm-pinctrl", + "marvell,armada-8k-cps-pinctrl" or "marvell,cp115-standalone-pinctrl" depending on the specific variant of the SoC being used. Available mpp pins/groups and functions: