Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: <stable@vger.kernel.org> # v3.7+
Fixes: 463e270f766a ("pinctrl: mvebu: add pinctrl driver for Armada XP")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Thomas Petazzoni 10 years ago
parent
80b3d04fea
commit
ea78b9511a
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
  2. 1 1
      drivers/pinctrl/mvebu/pinctrl-armada-xp.c

+ 1 - 1
Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
View File 

@@ -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)

+ 1 - 1
drivers/pinctrl/mvebu/pinctrl-armada-xp.c
View File 

@@ -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),