diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2016-10-04 09:06:33 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-10-04 21:14:20 +0200 |
| commit | 8aed8106c2ec4d943f5549b44539c27c09367d1c (patch) | |
| tree | a8bad2affa90aa92674986746f98926ca7a978f6 /drivers/pinctrl | |
| parent | 44eeb85eb185bf040024b39161cc938c88058025 (diff) | |
| download | barebox-8aed8106c2ec4d943f5549b44539c27c09367d1c.tar.gz barebox-8aed8106c2ec4d943f5549b44539c27c09367d1c.tar.xz | |
pinctrl: mvebu: armada-370 fix gpio name for mpp63
It was found that pin 63 also works as input and so the respective function
is renamed from "gpo" to "gpio". The respective commit in Linux is:
a526973e0291 ("pinctrl: mvebu: Fix mapping of pin 63 (gpo -> gpio)")
which appeared in v4.1-rc3. The devicetrees are fixed accordingly since
commit
ce5cad51f381 ("ARM: dts: armada-370: Update the mpp63 function in the device tree on Armada 370")
which appeared in v4.6-rc1.
This fixes a runtime warning on the affected machines
(globalscale-mirabox and netgear-rn104) and makes the pin functional
again.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/mvebu/armada-370.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/mvebu/armada-370.c b/drivers/pinctrl/mvebu/armada-370.c index 1c79bd62af..c2c1a0fa63 100644 --- a/drivers/pinctrl/mvebu/armada-370.c +++ b/drivers/pinctrl/mvebu/armada-370.c @@ -362,7 +362,7 @@ static struct mvebu_mpp_mode mv88f6710_mpp_modes[] = { MPP_FUNCTION(0x5, "audio", "mclk"), MPP_FUNCTION(0x6, "uart0", "cts")), MPP_MODE(63, "mpp63", armada_370_mpp_ctrl, - MPP_FUNCTION(0x0, "gpo", NULL), + MPP_FUNCTION(0x0, "gpio", NULL), MPP_FUNCTION(0x1, "spi0", "sck"), MPP_FUNCTION(0x2, "tclk", NULL)), MPP_MODE(64, "mpp64", armada_370_mpp_ctrl, |