vserver 1.9.5.x5

[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 8fd97e7..dfc6702 100644 (file)
--- a/arch/arm/mach-omap/board-innovator.c
+++ b/arch/arm/mach-omap/board-innovator.c
@@ -33,12 +33,10 @@
 
 #include "common.h"
 
-extern void __init omap_init_time(void);
+static int __initdata innovator_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1};
 
 #ifdef CONFIG_ARCH_OMAP1510
 
-extern int omap_gpio_init(void);
-
 /* Only FPGA needs to be mapped here. All others are done with ioremap */
 static struct map_desc innovator1510_io_desc[] __initdata = {
 { OMAP1510_FPGA_BASE, OMAP1510_FPGA_START, OMAP1510_FPGA_SIZE,
@@ -71,23 +69,17 @@ static struct platform_device *innovator1510_devices[] __initdata = {
 
 #endif /* CONFIG_ARCH_OMAP1510 */
 
-#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 },
-};
+#ifdef CONFIG_ARCH_OMAP16XX
 
 static struct resource innovator1610_smc91x_resources[] = {
        [0] = {
-               .start  = OMAP1610_ETHR_START,          /* Physical */
-               .end    = OMAP1610_ETHR_START + SZ_4K,
+               .start  = INNOVATOR1610_ETHR_START,             /* Physical */
+               .end    = INNOVATOR1610_ETHR_START + SZ_4K,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 0,                            /* Really GPIO 0 */
-               .end    = 0,
+               .start  = OMAP_GPIO_IRQ(0),
+               .end    = OMAP_GPIO_IRQ(0),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -103,31 +95,50 @@ static struct platform_device *innovator1610_devices[] __initdata = {
        &innovator1610_smc91x_device,
 };
 
-#endif /* CONFIG_ARCH_OMAP1610 */
+#endif /* CONFIG_ARCH_OMAP16XX */
+
+static void __init innovator_init_smc91x(void)
+{
+       if (cpu_is_omap1510()) {
+               fpga_write(fpga_read(OMAP1510_FPGA_RST) & ~1,
+                          OMAP1510_FPGA_RST);
+               udelay(750);
+       } else {
+               if ((omap_request_gpio(0)) < 0) {
+                       printk("Error requesting gpio 0 for smc91x irq\n");
+                       return;
+               }
+               omap_set_gpio_edge_ctrl(0, OMAP_GPIO_RISING_EDGE);
+       }
+}
 
 void innovator_init_irq(void)
 {
        omap_init_irq();
+       omap_gpio_init();
 #ifdef CONFIG_ARCH_OMAP1510
        if (cpu_is_omap1510()) {
-               omap_gpio_init();
                omap1510_fpga_init_irq();
        }
 #endif
+       innovator_init_smc91x();
 }
 
 #ifdef CONFIG_ARCH_OMAP1510
 static struct omap_usb_config innovator1510_usb_config __initdata = {
-       /* has usb host and device, but no Mini-AB port */
+       /* for bundled non-standard host and peripheral cables */
+       .hmc_mode       = 4,
+
        .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_OMAP1610
+#ifdef CONFIG_ARCH_OMAP16XX
 static struct omap_usb_config h2_usb_config __initdata = {
        /* usb1 has a Mini-AB port and external isp1301 transceiver */
        .otg            = 2,
@@ -155,7 +166,7 @@ static void __init innovator_init(void)
                platform_add_devices(innovator1510_devices, ARRAY_SIZE(innovator1510_devices));
        }
 #endif
-#ifdef CONFIG_ARCH_OMAP1610
+#ifdef CONFIG_ARCH_OMAP16XX
        if (!cpu_is_omap1510()) {
                platform_add_devices(innovator1610_devices, ARRAY_SIZE(innovator1610_devices));
        }
@@ -165,7 +176,7 @@ static void __init innovator_init(void)
        if (cpu_is_omap1510())
                innovator_config[0].data = &innovator1510_usb_config;
 #endif
-#ifdef CONFIG_ARCH_OMAP1610
+#ifdef CONFIG_ARCH_OMAP16XX
        if (cpu_is_omap1610())
                innovator_config[0].data = &h2_usb_config;
 #endif
@@ -189,11 +200,7 @@ static void __init innovator_map_io(void)
                       fpga_read(OMAP1510_FPGA_BOARD_REV));
        }
 #endif
-#ifdef CONFIG_ARCH_OMAP1610
-       if (!cpu_is_omap1510()) {
-               iotable_init(innovator1610_io_desc, ARRAY_SIZE(innovator1610_io_desc));
-       }
-#endif
+       omap_serial_init(innovator_serial_ports);
 }
 
 MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
@@ -203,5 +210,5 @@ MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
        MAPIO(innovator_map_io)
        INITIRQ(innovator_init_irq)
        INIT_MACHINE(innovator_init)
-       INITTIME(omap_init_time)
+       .timer          = &omap_timer,
 MACHINE_END