OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pinctrl-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[uclinux-h8/linux.git]
/
drivers
/
pinctrl
/
mvebu
/
pinctrl-armada-370.c
diff --git
a/drivers/pinctrl/mvebu/pinctrl-armada-370.c
b/drivers/pinctrl/mvebu/pinctrl-armada-370.c
index
c2e5e4d
..
73dc1bc
100644
(file)
--- a/
drivers/pinctrl/mvebu/pinctrl-armada-370.c
+++ b/
drivers/pinctrl/mvebu/pinctrl-armada-370.c
@@
-364,7
+364,7
@@
static struct mvebu_mpp_mode mv88f6710_mpp_modes[] = {
MPP_FUNCTION(0x5, "audio", "mclk"),
MPP_FUNCTION(0x6, "uart0", "cts")),
MPP_MODE(63,
- MPP_FUNCTION(0x0, "gpo", NULL),
+ MPP_FUNCTION(0x0, "gp
i
o", NULL),
MPP_FUNCTION(0x1, "spi0", "sck"),
MPP_FUNCTION(0x2, "tclk", NULL)),
MPP_MODE(64,