diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-07 08:27:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-07 08:27:38 -0700 |
| commit | fbb7b92f16710a3848db25d0a4a2bb6fb7199061 (patch) | |
| tree | 4f150a9643eda5fee248819981777d4b07de4735 /drivers/pinctrl/mvebu/pinctrl-armada-370.c | |
| parent | Merge tag 'vfio-v4.1-rc3' of git://github.com/awilliam/linux-vfio (diff) | |
| parent | pinctrl: Don't just pretend to protect pinctrl_maps, do it for real (diff) | |
| download | linux-dev-fbb7b92f16710a3848db25d0a4a2bb6fb7199061.tar.xz linux-dev-fbb7b92f16710a3848db25d0a4a2bb6fb7199061.zip | |
Merge tag 'pinctrl-v4.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control fixes from Linus Walleij:
"Here is a smallish set of pin control fixes for the v4.1 cycle,
collected the last two weeks:
- fix a real nasty legacy bug that has screwed up the protection of
adding pinctrl maps dynamically. Normally this didn't happen so
much but Dough Anderson ran into it and fixed it, kudos!
- minor driver fixes for Qualcomm spmi, mediatek and Marvell drivers"
* tag 'pinctrl-v4.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl: Don't just pretend to protect pinctrl_maps, do it for real
pinctrl: mediatek: mtk-common: initialize unmask
pinctrl: qcom-spmi-mpp: Fix input value report
pinctrl: qcom-spmi: Fix pin direction configuration
pinctrl: mvebu: Fix mapping of pin 63 (gpo -> gpio)
Diffstat (limited to 'drivers/pinctrl/mvebu/pinctrl-armada-370.c')
| -rw-r--r-- | drivers/pinctrl/mvebu/pinctrl-armada-370.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-370.c b/drivers/pinctrl/mvebu/pinctrl-armada-370.c index 42f930f70de3..03aa58c4cb85 100644 --- 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, "gpio", NULL), MPP_FUNCTION(0x1, "spi0", "sck"), MPP_FUNCTION(0x2, "tclk", NULL)), MPP_MODE(64, |