Merge branch 'for-2.6.32' into for-2.6.33

1 files changed, 8 insertions, 0 deletions

diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c
index fb47239da72f..6c8a41f20e51 100644
--- a/arch/arm/mach-omap1/board-generic.c
+++ b/arch/arm/mach-omap1/board-generic.c
@@ -64,6 +64,14 @@ static void __init omap_generic_init(void)
 {
 #ifdef CONFIG_ARCH_OMAP15XX
         if (cpu_is_omap15xx()) {
+                /* mux pins for uarts */
+                omap_cfg_reg(UART1_TX);
+                omap_cfg_reg(UART1_RTS);
+                omap_cfg_reg(UART2_TX);
+                omap_cfg_reg(UART2_RTS);
+                omap_cfg_reg(UART3_TX);
+                omap_cfg_reg(UART3_RX);
+
                 omap_usb_init(&generic1510_usb_config);
         }
 #endif