Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea78b951 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Linus Walleij
Browse files

pinctrl: mvebu: armada-xp: fix functions of MPP48 



There was a mistake in the definition of the functions for MPP48 on
Marvell Armada XP. The second function is dev(clkout), and not tclk.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: <stable@vger.kernel.org> # v3.7+
Fixes: 463e270f ("pinctrl: mvebu: add pinctrl driver for Armada XP")
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 80b3d04f

Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ mpp45 45 gpio, uart2(rts), uart3(txd), spi(cs5), sata1(prsnt) 
mpp46         46       gpio, uart3(rts), uart1(rts), spi(cs6), sata0(prsnt)

mpp47         47       gpio, uart3(cts), uart1(cts), spi(cs7), pcie(clkreq3),

                       ref(clkout)

mpp48         48       gpio, tclk, dev(burst/last)

mpp48         48       gpio, dev(clkout), dev(burst/last)



* Marvell Armada XP (mv78260 and mv78460 only)

drivers/pinctrl/mvebu/pinctrl-armada-xp.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static struct mvebu_mpp_mode armada_xp_mpp_modes[] = { 
		 MPP_VAR_FUNCTION(0x5, "pcie", "clkreq3",   V_MV78230_PLUS)),

	MPP_MODE(48,

		 MPP_VAR_FUNCTION(0x0, "gpio", NULL,        V_MV78230_PLUS),

		 MPP_VAR_FUNCTION(0x1, "tclk", NULL,        V_MV78230_PLUS),

		 MPP_VAR_FUNCTION(0x1, "dev", "clkout",     V_MV78230_PLUS),

		 MPP_VAR_FUNCTION(0x2, "dev", "burst/last", V_MV78230_PLUS)),

	MPP_MODE(49,

		 MPP_VAR_FUNCTION(0x0, "gpio", NULL,        V_MV78260_PLUS),