diff options
author | Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> | 2009-10-22 17:47:42 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-10-22 17:47:42 -0400 |
commit | c33da3a80074094303d643a90ef589330b491270 (patch) | |
tree | 64c8a0d9a56a4590e21641c04deae0b6a66eb8c0 /arch/arm/mach-omap1/board-palmtt.c | |
parent | dcc730dc9d7614fdaf6bce73d6e8ffe47c8820b1 (diff) |
omap1: Fix redundant UARTs pin muxing that can break other hardware support
Commit 15ac408ee5a509053a765b816e9179515329369f removed enabled_uart
and OMAP_TAG_UART. This works for mach-omap2, but causes issues on
mach-omap1 for some boards as the mach-omap1 serial.c was muxing
pins based on the enabled_uart flag for 15xx.
Fix this by muxing pins in board-*.c files for the 15xx boards for
the uart ports that had enabled_uart flag set before the commit
above.
Tested on Amsdtrad Delta only.
Note that in the future we should add support for powering down
the uarts with a timer like mach-omap2/serial.c does. Otherwise
the enabled uarts will be blocking retention-while-idle.
Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-palmtt.c')
-rw-r--r-- | arch/arm/mach-omap1/board-palmtt.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c index 8256139891ff..d972cf941b76 100644 --- a/arch/arm/mach-omap1/board-palmtt.c +++ b/arch/arm/mach-omap1/board-palmtt.c | |||
@@ -289,6 +289,14 @@ static void __init omap_mpu_wdt_mode(int mode) { | |||
289 | 289 | ||
290 | static void __init omap_palmtt_init(void) | 290 | static void __init omap_palmtt_init(void) |
291 | { | 291 | { |
292 | /* mux pins for uarts */ | ||
293 | omap_cfg_reg(UART1_TX); | ||
294 | omap_cfg_reg(UART1_RTS); | ||
295 | omap_cfg_reg(UART2_TX); | ||
296 | omap_cfg_reg(UART2_RTS); | ||
297 | omap_cfg_reg(UART3_TX); | ||
298 | omap_cfg_reg(UART3_RX); | ||
299 | |||
292 | omap_mpu_wdt_mode(0); | 300 | omap_mpu_wdt_mode(0); |
293 | 301 | ||
294 | omap_board_config = palmtt_config; | 302 | omap_board_config = palmtt_config; |