This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/arm/mach-omap/board-h2.c b/arch/arm/mach-omap/board-h2.c
index f273b8d..1441089 100644 (file)
--- a/arch/arm/mach-omap/board-h2.c
+++ b/arch/arm/mach-omap/board-h2.c
@@ -32,11 +32,16 @@
 #include <asm/arch/clocks.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/usb.h>
-#include <asm/arch/serial.h>
 
 #include "common.h"
 
-static int __initdata h2_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1};
+extern void __init omap_init_time(void);
+
+static struct map_desc h2_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 h2_smc91x_resources[] = {
        [0] = {
@@ -75,22 +80,15 @@ static struct omap_usb_config h2_usb_config __initdata = {
        .hmc_mode       = 19,   // 0:host(off) 1:dev|otg 2:disabled
        // .hmc_mode    = 21,   // 0:host(off) 1:dev(loopback) 2:host(loopback)
 #elif  defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
-       /* needs OTG cable, or NONSTANDARD (B-to-MiniB) */
+       /* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */
        .hmc_mode       = 20,   // 1:dev|otg(off) 1:host 2:disabled
 #endif
 
        .pins[1]        = 3,
 };
 
-static struct omap_mmc_config h2_mmc_config __initdata = {
-       .mmc_blocks             = 1,
-       .mmc1_power_pin         = -1,   /* tps65010 gpio3 */
-       .mmc1_switch_pin        = OMAP_MPUIO(1),
-};
-
 static struct omap_board_config_kernel h2_config[] = {
        { OMAP_TAG_USB,           &h2_usb_config },
-       { OMAP_TAG_MMC,           &h2_mmc_config },
 };
 
 static void __init h2_init(void)
@@ -103,7 +101,7 @@ static void __init h2_init(void)
 static void __init h2_map_io(void)
 {
        omap_map_io();
-       omap_serial_init(h2_serial_ports);
+       iotable_init(h2_io_desc, ARRAY_SIZE(h2_io_desc));
 }
 
 MACHINE_START(OMAP_H2, "TI-H2")
@@ -113,5 +111,5 @@ MACHINE_START(OMAP_H2, "TI-H2")
        MAPIO(h2_map_io)
        INITIRQ(h2_init_irq)
        INIT_MACHINE(h2_init)
-       .timer          = &omap_timer,
+       INITTIME(omap_init_time)
 MACHINE_END