vserver 2.0 rc7

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

diff --git a/arch/arm/mach-omap/board-h3.c b/arch/arm/mach-omap/board-h3.c
index fd1d936..486a5a0 100644 (file)
--- a/arch/arm/mach-omap/board-h3.c
+++ b/arch/arm/mach-omap/board-h3.c
@@ -21,16 +21,22 @@
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/errno.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
 
 #include <asm/setup.h>
 #include <asm/page.h>
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+#include <asm/mach/flash.h>
 #include <asm/mach/map.h>
+
+#include <asm/arch/gpio.h>
 #include <asm/arch/irqs.h>
 #include <asm/arch/mux.h>
-#include <asm/arch/gpio.h>
-#include <asm/mach-types.h>
+#include <asm/arch/tc.h>
+#include <asm/arch/usb.h>
 
 #include "common.h"
 
@@ -38,10 +44,64 @@ extern int omap_gpio_init(void);
 
 static int __initdata h3_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1};
 
+static struct mtd_partition h3_partitions[] = {
+       /* bootloader (U-Boot, etc) in first sector */
+       {
+             .name             = "bootloader",
+             .offset           = 0,
+             .size             = SZ_128K,
+             .mask_flags       = MTD_WRITEABLE, /* force read-only */
+       },
+       /* bootloader params in the next sector */
+       {
+             .name             = "params",
+             .offset           = MTDPART_OFS_APPEND,
+             .size             = SZ_128K,
+             .mask_flags       = 0,
+       },
+       /* kernel */
+       {
+             .name             = "kernel",
+             .offset           = MTDPART_OFS_APPEND,
+             .size             = SZ_2M,
+             .mask_flags       = 0
+       },
+       /* file system */
+       {
+             .name             = "filesystem",
+             .offset           = MTDPART_OFS_APPEND,
+             .size             = MTDPART_SIZ_FULL,
+             .mask_flags       = 0
+       }
+};
+
+static struct flash_platform_data h3_flash_data = {
+       .map_name       = "cfi_probe",
+       .width          = 2,
+       .parts          = h3_partitions,
+       .nr_parts       = ARRAY_SIZE(h3_partitions),
+};
+
+static struct resource h3_flash_resource = {
+       .start          = OMAP_CS2B_PHYS,
+       .end            = OMAP_CS2B_PHYS + OMAP_CS2B_SIZE - 1,
+       .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device flash_device = {
+       .name           = "omapflash",
+       .id             = 0,
+       .dev            = {
+               .platform_data  = &h3_flash_data,
+       },
+       .num_resources  = 1,
+       .resource       = &h3_flash_resource,
+};
+
 static struct resource smc91x_resources[] = {
        [0] = {
                .start  = OMAP1710_ETHR_START,          /* Physical */
-               .end    = OMAP1710_ETHR_START + OMAP1710_ETHR_SIZE,
+               .end    = OMAP1710_ETHR_START + 0xf,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -58,8 +118,52 @@ static struct platform_device smc91x_device = {
        .resource       = smc91x_resources,
 };
 
+#define GPTIMER_BASE           0xFFFB1400
+#define GPTIMER_REGS(x)        (0xFFFB1400 + (x * 0x800))
+#define GPTIMER_REGS_SIZE      0x46
+
+static struct resource intlat_resources[] = {
+       [0] = {
+               .start  = GPTIMER_REGS(0),            /* Physical */
+               .end    = GPTIMER_REGS(0) + GPTIMER_REGS_SIZE,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = INT_1610_GPTIMER1,
+               .end    = INT_1610_GPTIMER1,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct platform_device intlat_device = {
+       .name      = "omap_intlat",
+       .id          = 0,
+       .num_resources  = ARRAY_SIZE(intlat_resources),
+       .resource       = intlat_resources,
+};
+
 static struct platform_device *devices[] __initdata = {
+       &flash_device,
         &smc91x_device,
+       &intlat_device,
+};
+
+static struct omap_usb_config h3_usb_config __initdata = {
+       /* usb1 has a Mini-AB port and external isp1301 transceiver */
+       .otg        = 2,
+
+#ifdef CONFIG_USB_GADGET_OMAP
+       .hmc_mode       = 19,   /* 0:host(off) 1:dev|otg 2:disabled */
+#elif  defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
+       /* 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_board_config_kernel h3_config[] = {
+       { OMAP_TAG_USB,  &h3_usb_config },
 };
 
 static void __init h3_init(void)