vserver 1.9.5.x5

[linux-2.6.git] / arch / arm / mach-omap / board-generic.c

diff --git a/arch/arm/mach-omap/board-generic.c b/arch/arm/mach-omap/board-generic.c
index 447046b..586bc12 100644 (file)
--- a/arch/arm/mach-omap/board-generic.c
+++ b/arch/arm/mach-omap/board-generic.c
@@ -22,31 +22,44 @@
 #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};
+
 static void __init omap_generic_init_irq(void)
 {
        omap_init_irq();
 }
 
-/*
- * Muxes the serial ports on
- */
-static void __init omap_early_serial_init(void)
-{
-       omap_cfg_reg(UART1_TX);
-       omap_cfg_reg(UART1_RTS);
+/* assume no Mini-AB port */
 
-       omap_cfg_reg(UART2_TX);
-       omap_cfg_reg(UART2_RTS);
+#ifdef CONFIG_ARCH_OMAP1510
+static struct omap_usb_config generic1510_usb_config __initdata = {
+       .register_host  = 1,
+       .register_dev   = 1,
+       .hmc_mode       = 16,
+       .pins[0]        = 3,
+};
+#endif
 
-       omap_cfg_reg(UART3_TX);
-       omap_cfg_reg(UART3_RX);
-}
+#if defined(CONFIG_ARCH_OMAP16XX)
+static struct omap_usb_config generic1610_usb_config __initdata = {
+       .register_host  = 1,
+       .register_dev   = 1,
+       .hmc_mode       = 16,
+       .pins[0]        = 6,
+};
+#endif
+
+static struct omap_board_config_kernel generic_config[] = {
+       { OMAP_TAG_USB,           NULL },
+};
 
 static void __init omap_generic_init(void)
 {
@@ -55,9 +68,19 @@ static void __init omap_generic_init(void)
         * You have to mux them off in device drivers later on
         * if not needed.
         */
+#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)
+       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)
@@ -65,18 +88,12 @@ static void __init omap_generic_map_io(void)
        omap_map_io();
 }
 
-static void __init omap_generic_init_time(void)
-{
-       omap_init_time();
-}
-
-MACHINE_START(OMAP_GENERIC, "Generic OMAP-1510/1610/1710")
+MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")
        MAINTAINER("Tony Lindgren <tony@atomide.com>")
        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
        BOOT_PARAMS(0x10000100)
        MAPIO(omap_generic_map_io)
        INITIRQ(omap_generic_init_irq)
        INIT_MACHINE(omap_generic_init)
-       INITTIME(omap_generic_init_time)
+       .timer          = &omap_timer,
 MACHINE_END
-