This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/arm/mach-omap/board-innovator.c b/arch/arm/mach-omap/board-innovator.c
index 1ad7a4a..8fd97e7 100644 (file)
--- a/arch/arm/mach-omap/board-innovator.c
+++ b/arch/arm/mach-omap/board-innovator.c
@@ -30,10 +30,11 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/fpga.h>
 #include <asm/arch/usb.h>
-#include <asm/arch/serial.h>
 
 #include "common.h"
 
+extern void __init omap_init_time(void);
+
 #ifdef CONFIG_ARCH_OMAP1510
 
 extern int omap_gpio_init(void);
@@ -44,8 +45,6 @@ static struct map_desc innovator1510_io_desc[] __initdata = {
        MT_DEVICE },
 };
 
-static int __initdata innovator_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1};
-
 static struct resource innovator1510_smc91x_resources[] = {
        [0] = {
                .start  = OMAP1510_FPGA_ETHR_START,     /* Physical */
@@ -72,12 +71,18 @@ static struct platform_device *innovator1510_devices[] __initdata = {
 
 #endif /* CONFIG_ARCH_OMAP1510 */
 
-#ifdef CONFIG_ARCH_OMAP16XX
+#ifdef CONFIG_ARCH_OMAP1610
+
+static struct map_desc innovator1610_io_desc[] __initdata = {
+{ OMAP1610_ETHR_BASE, OMAP1610_ETHR_START, OMAP1610_ETHR_SIZE,MT_DEVICE },
+{ OMAP1610_NOR_FLASH_BASE, OMAP1610_NOR_FLASH_START, OMAP1610_NOR_FLASH_SIZE,
+       MT_DEVICE },
+};
 
 static struct resource innovator1610_smc91x_resources[] = {
        [0] = {
-               .start  = INNOVATOR1610_ETHR_START,             /* Physical */
-               .end    = INNOVATOR1610_ETHR_START + SZ_4K,
+               .start  = OMAP1610_ETHR_START,          /* Physical */
+               .end    = OMAP1610_ETHR_START + SZ_4K,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -98,7 +103,7 @@ static struct platform_device *innovator1610_devices[] __initdata = {
        &innovator1610_smc91x_device,
 };
 
-#endif /* CONFIG_ARCH_OMAP16XX */
+#endif /* CONFIG_ARCH_OMAP1610 */
 
 void innovator_init_irq(void)
 {
@@ -113,19 +118,16 @@ void innovator_init_irq(void)
 
 #ifdef CONFIG_ARCH_OMAP1510
 static struct omap_usb_config innovator1510_usb_config __initdata = {
-       /* for bundled non-standard host and peripheral cables */
-       .hmc_mode       = 4,
-
+       /* has usb host and device, but no Mini-AB port */
        .register_host  = 1,
-       .pins[1]        = 6,
-       .pins[2]        = 6,            /* Conflicts with UART2 */
-
        .register_dev   = 1,
+       /* Assume bad Innovator wiring; Use internal host only with custom cable */
+       .hmc_mode       = 16,
        .pins[0]        = 2,
 };
 #endif
 
-#ifdef CONFIG_ARCH_OMAP16XX
+#ifdef CONFIG_ARCH_OMAP1610
 static struct omap_usb_config h2_usb_config __initdata = {
        /* usb1 has a Mini-AB port and external isp1301 transceiver */
        .otg            = 2,
@@ -153,7 +155,7 @@ static void __init innovator_init(void)
                platform_add_devices(innovator1510_devices, ARRAY_SIZE(innovator1510_devices));
        }
 #endif
-#ifdef CONFIG_ARCH_OMAP16XX
+#ifdef CONFIG_ARCH_OMAP1610
        if (!cpu_is_omap1510()) {
                platform_add_devices(innovator1610_devices, ARRAY_SIZE(innovator1610_devices));
        }
@@ -163,7 +165,7 @@ static void __init innovator_init(void)
        if (cpu_is_omap1510())
                innovator_config[0].data = &innovator1510_usb_config;
 #endif
-#ifdef CONFIG_ARCH_OMAP16XX
+#ifdef CONFIG_ARCH_OMAP1610
        if (cpu_is_omap1610())
                innovator_config[0].data = &h2_usb_config;
 #endif
@@ -187,7 +189,11 @@ static void __init innovator_map_io(void)
                       fpga_read(OMAP1510_FPGA_BOARD_REV));
        }
 #endif
-       omap_serial_init(innovator_serial_ports);
+#ifdef CONFIG_ARCH_OMAP1610
+       if (!cpu_is_omap1510()) {
+               iotable_init(innovator1610_io_desc, ARRAY_SIZE(innovator1610_io_desc));
+       }
+#endif
 }
 
 MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
@@ -197,5 +203,5 @@ MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
        MAPIO(innovator_map_io)
        INITIRQ(innovator_init_irq)
        INIT_MACHINE(innovator_init)
-       .timer          = &omap_timer,
+       INITTIME(omap_init_time)
 MACHINE_END