#include <asm/mach/arch.h>
#include <asm/mach/map.h>
+#include <asm/arch/clocks.h>
#include <asm/arch/gpio.h>
#include <asm/arch/mux.h>
#include <asm/arch/usb.h>
#include <asm/arch/board.h>
-#include <asm/arch/serial.h>
#include "common.h"
-static int __initdata generic_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1};
+extern void __init omap_init_time(void);
static void __init omap_generic_init_irq(void)
{
omap_init_irq();
}
+/*
+ * Muxes the serial ports on
+ */
+#ifdef CONFIG_ARCH_OMAP1510
+static void __init omap_early_serial_init(void)
+{
+#ifdef CONFIG_OMAP_LL_DEBUG_UART1
+ omap_cfg_reg(UART1_TX);
+ omap_cfg_reg(UART1_RTS);
+#endif
+
+#ifdef CONFIG_OMAP_LL_DEBUG_UART2
+ omap_cfg_reg(UART2_TX);
+ omap_cfg_reg(UART2_RTS);
+#endif
+
+#ifdef CONFIG_OMAP_LL_DEBUG_UART1
+ omap_cfg_reg(UART3_TX);
+ omap_cfg_reg(UART3_RX);
+#endif
+}
+#endif
+
/* assume no Mini-AB port */
#ifdef CONFIG_ARCH_OMAP1510
};
#endif
-#if defined(CONFIG_ARCH_OMAP16XX)
+#ifdef CONFIG_ARCH_OMAP1610
static struct omap_usb_config generic1610_usb_config __initdata = {
.register_host = 1,
.register_dev = 1,
*/
#ifdef CONFIG_ARCH_OMAP1510
if (cpu_is_omap1510()) {
+ omap_early_serial_init();
generic_config[0].data = &generic1510_usb_config;
}
#endif
-#if defined(CONFIG_ARCH_OMAP16XX)
+#ifdef CONFIG_ARCH_OMAP1610
if (!cpu_is_omap1510()) {
generic_config[0].data = &generic1610_usb_config;
}
#endif
omap_board_config = generic_config;
omap_board_config_size = ARRAY_SIZE(generic_config);
- omap_serial_init(generic_serial_ports);
}
static void __init omap_generic_map_io(void)
MAPIO(omap_generic_map_io)
INITIRQ(omap_generic_init_irq)
INIT_MACHINE(omap_generic_init)
- .timer = &omap_timer,
+ INITTIME(omap_init_time)
MACHINE_END