diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-06 02:00:48 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-06 02:00:48 -0500 |
| commit | 02cee68998010c4a2cc2383c86babc2ecc737183 (patch) | |
| tree | 13c6483472f672c3b2570b075ed2ad4fd4c5405e /arch/arm/mach-omap1/board-voiceblue.c | |
| parent | f5ba35023697e54a24487bcd822194390a333893 (diff) | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
Merge commit 'v2.6.32-rc6' into next
Diffstat (limited to 'arch/arm/mach-omap1/board-voiceblue.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-voiceblue.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index c06e7a553472..07b07522d5bf 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c | |||
| @@ -152,6 +152,14 @@ static void __init voiceblue_init_irq(void) | |||
| 152 | 152 | ||
| 153 | static void __init voiceblue_init(void) | 153 | static void __init voiceblue_init(void) |
| 154 | { | 154 | { |
| 155 | /* mux pins for uarts */ | ||
| 156 | omap_cfg_reg(UART1_TX); | ||
| 157 | omap_cfg_reg(UART1_RTS); | ||
| 158 | omap_cfg_reg(UART2_TX); | ||
| 159 | omap_cfg_reg(UART2_RTS); | ||
| 160 | omap_cfg_reg(UART3_TX); | ||
| 161 | omap_cfg_reg(UART3_RX); | ||
| 162 | |||
| 155 | /* Watchdog */ | 163 | /* Watchdog */ |
| 156 | gpio_request(0, "Watchdog"); | 164 | gpio_request(0, "Watchdog"); |
| 157 | /* smc91x reset */ | 165 | /* smc91x reset */ |