From b3e66fa8dcb576b3431537bcf37d92cb1acecf97 Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Mon, 17 Sep 2012 18:52:15 +0200 Subject: [PATCH] --- yaml --- r: 328487 b: refs/heads/master c: 0fda8f00c6f4b9b2d3a1e47b3505cd4b0a1aac61 h: refs/heads/master i: 328485: ac3eee324b63fc571df60eba5be3f2e6e6cef666 328483: cd0ca3a1ada051b5b0b08de2feafc8f70567ae00 328479: fb0bd054da1d56e2f2744726f5c8460addd5d0dc v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ux500/board-mop500-pins.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 859756f135a4..00827329c177 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a695145b9c4225eeadf56c3caf37cb3b525a32d4 +refs/heads/master: 0fda8f00c6f4b9b2d3a1e47b3505cd4b0a1aac61 diff --git a/trunk/arch/arm/mach-ux500/board-mop500-pins.c b/trunk/arch/arm/mach-ux500/board-mop500-pins.c index f0affc397c03..a96b945976e4 100644 --- a/trunk/arch/arm/mach-ux500/board-mop500-pins.c +++ b/trunk/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 */