diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 15:49:38 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 15:49:38 +0000 |
| commit | 419bb4e0641cf7d84b1684b15afdd176f25c7ebe (patch) | |
| tree | 41167d5ded971302600638029545e4baee796bed /arch/arm/mach-mmp/gplugd.c | |
| parent | 143ed290f02496fb918789cf14949e4e8033d34d (diff) | |
| parent | af9dafb1dcf320a46783e09764c758bc4e32ed94 (diff) | |
| download | blackbird-op-linux-419bb4e0641cf7d84b1684b15afdd176f25c7ebe.tar.gz blackbird-op-linux-419bb4e0641cf7d84b1684b15afdd176f25c7ebe.zip | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-mmp/gplugd.c')
| -rw-r--r-- | arch/arm/mach-mmp/gplugd.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/arch/arm/mach-mmp/gplugd.c b/arch/arm/mach-mmp/gplugd.c index c070c24255f4..98e25d9aaab6 100644 --- a/arch/arm/mach-mmp/gplugd.c +++ b/arch/arm/mach-mmp/gplugd.c @@ -16,16 +16,18 @@ #include <mach/gpio.h> #include <mach/pxa168.h> #include <mach/mfp-pxa168.h> -#include <mach/mfp-gplugd.h> #include "common.h" static unsigned long gplugd_pin_config[] __initdata = { /* UART3 */ - GPIO8_UART3_SOUT, - GPIO9_UART3_SIN, - GPI1O_UART3_CTS, - GPI11_UART3_RTS, + GPIO8_UART3_TXD, + GPIO9_UART3_RXD, + GPIO1O_UART3_CTS, + GPIO11_UART3_RTS, + + /* USB OTG PEN */ + GPIO18_GPIO, /* MMC2 */ GPIO28_MMC2_CMD, @@ -109,6 +111,12 @@ static unsigned long gplugd_pin_config[] __initdata = { GPIO105_CI2C_SDA, GPIO106_CI2C_SCL, + /* SPI NOR Flash on SSP2 */ + GPIO107_SSP2_RXD, + GPIO108_SSP2_TXD, + GPIO110_GPIO, /* SPI_CSn */ + GPIO111_SSP2_CLK, + /* Select JTAG */ GPIO109_GPIO, @@ -154,7 +162,7 @@ static void __init select_disp_freq(void) "frequency\n"); } else { gpio_direction_output(35, 1); - gpio_free(104); + gpio_free(35); } if (unlikely(gpio_request(85, "DISP_FREQ_SEL_2"))) { @@ -162,7 +170,7 @@ static void __init select_disp_freq(void) "frequency\n"); } else { gpio_direction_output(85, 0); - gpio_free(104); + gpio_free(85); } } |
