upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[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..57cf4da 100644 (file)
--- a/arch/arm/mach-omap/board-innovator.c
+++ b/arch/arm/mach-omap/board-innovator.c
@@ -20,23 +20,86 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/delay.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.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/clocks.h>
-#include <asm/arch/gpio.h>
 #include <asm/arch/fpga.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/tc.h>
 #include <asm/arch/usb.h>
-#include <asm/arch/serial.h>
 
 #include "common.h"
 
-#ifdef CONFIG_ARCH_OMAP1510
+static int __initdata innovator_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1};
+
+static struct mtd_partition innovator_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
+       },
+       /* rest of flash1 is a file system */
+       {
+             .name             = "rootfs",
+             .offset           = MTDPART_OFS_APPEND,
+             .size             = SZ_16M - SZ_2M - 2 * SZ_128K,
+             .mask_flags       = 0
+       },
+       /* file system */
+       {
+             .name             = "filesystem",
+             .offset           = MTDPART_OFS_APPEND,
+             .size             = MTDPART_SIZ_FULL,
+             .mask_flags       = 0
+       }
+};
 
-extern int omap_gpio_init(void);
+static struct flash_platform_data innovator_flash_data = {
+       .map_name       = "cfi_probe",
+       .width          = 2,
+       .parts          = innovator_partitions,
+       .nr_parts       = ARRAY_SIZE(innovator_partitions),
+};
+
+static struct resource innovator_flash_resource = {
+       .start          = OMAP_CS0_PHYS,
+       .end            = OMAP_CS0_PHYS + SZ_32M - 1,
+       .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device innovator_flash_device = {
+       .name           = "omapflash",
+       .id             = 0,
+       .dev            = {
+               .platform_data  = &innovator_flash_data,
+       },
+       .num_resources  = 1,
+       .resource       = &innovator_flash_resource,
+};
+
+#ifdef CONFIG_ARCH_OMAP1510
 
 /* Only FPGA needs to be mapped here. All others are done with ioremap */
 static struct map_desc innovator1510_io_desc[] __initdata = {
@@ -44,12 +107,10 @@ 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 */
-               .end    = OMAP1510_FPGA_ETHR_START + 16,
+               .end    = OMAP1510_FPGA_ETHR_START + 0xf,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -67,6 +128,7 @@ static struct platform_device innovator1510_smc91x_device = {
 };
 
 static struct platform_device *innovator1510_devices[] __initdata = {
+       &innovator_flash_device,
        &innovator1510_smc91x_device,
 };
 
@@ -77,12 +139,12 @@ static struct platform_device *innovator1510_devices[] __initdata = {
 static struct resource innovator1610_smc91x_resources[] = {
        [0] = {
                .start  = INNOVATOR1610_ETHR_START,             /* Physical */
-               .end    = INNOVATOR1610_ETHR_START + SZ_4K,
+               .end    = INNOVATOR1610_ETHR_START + 0xf,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 0,                            /* Really GPIO 0 */
-               .end    = 0,
+               .start  = OMAP_GPIO_IRQ(0),
+               .end    = OMAP_GPIO_IRQ(0),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -95,20 +157,37 @@ static struct platform_device innovator1610_smc91x_device = {
 };
 
 static struct platform_device *innovator1610_devices[] __initdata = {
+       &innovator_flash_device,
        &innovator1610_smc91x_device,
 };
 
 #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