summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPatrice Chotard <patrice.chotard@stericsson.com>2012-09-17 18:52:15 +0200
committerLinus Walleij <linus.walleij@linaro.org>2012-09-18 15:19:16 +0200
commit0fda8f00c6f4b9b2d3a1e47b3505cd4b0a1aac61 (patch)
treedf96f071412b34570bd43d99e76706a403ebac28 /arch
parenta695145b9c4225eeadf56c3caf37cb3b525a32d4 (diff)
downloadlinux-stable-0fda8f00c6f4b9b2d3a1e47b3505cd4b0a1aac61.tar.gz
linux-stable-0fda8f00c6f4b9b2d3a1e47b3505cd4b0a1aac61.tar.bz2
linux-stable-0fda8f00c6f4b9b2d3a1e47b3505cd4b0a1aac61.zip
ARM: ux500: fix spi2 pin group
GPIO216_AG12 is configured as a gpio for SPI2, so select the spi2_oc1_2 pin group instead of spi2_oc1_1 Signed-off-by: Patrice Chotard <patrice.chotard@stericsson.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ux500/board-mop500-pins.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c
index f0affc397c03..a96b945976e4 100644
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -219,7 +219,7 @@ static struct pinctrl_map __initdata mop500_family_pinmap[] = {
DB8500_MUX("usb_a_1", "usb", "musb-ux500.0"),
DB8500_PIN("GPIO257_AE29", out_hi, "musb-ux500.0"), /* STP */
/* Mux in SPI2 pins on the "other C1" altfunction */
- DB8500_MUX("spi2_oc1_1", "spi2", "spi2"),
+ DB8500_MUX("spi2_oc1_2", "spi2", "spi2"),
DB8500_PIN("GPIO216_AG12", gpio_out_hi, "spi2"), /* FRM */
DB8500_PIN("GPIO218_AH11", in_pd, "spi2"), /* RXD */
DB8500_PIN("GPIO215_AH13", out_lo, "spi2"), /* TXD */