1 files changed, 115 insertions, 9 deletions

diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 6844e536c698..21103df50415 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -29,11 +29,16 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/interrupt.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/map.h>
+#include <asm/mach/flash.h>
 
 #include <asm/arch/gpio.h>
 #include <asm/arch/usb.h>
@@ -41,12 +46,56 @@
 #include <asm/arch/tc.h>
 #include <asm/arch/common.h>
 
-static struct map_desc osk5912_io_desc[] __initdata = {
-{ OMAP_OSK_NOR_FLASH_BASE, OMAP_OSK_NOR_FLASH_START, OMAP_OSK_NOR_FLASH_SIZE,
-        MT_DEVICE },
+static int __initdata osk_serial_ports[OMAP_MAX_NR_PORTS] = {1, 0, 0};
+
+static struct mtd_partition osk_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,
+        }, {
+              .name             = "kernel",
+              .offset           = MTDPART_OFS_APPEND,
+              .size             = SZ_2M,
+              .mask_flags       = 0
+        }, {
+              .name             = "filesystem",
+              .offset           = MTDPART_OFS_APPEND,
+              .size             = MTDPART_SIZ_FULL,
+              .mask_flags       = 0
+        }
 };
 
-static int __initdata osk_serial_ports[OMAP_MAX_NR_PORTS] = {1, 0, 0};
+static struct flash_platform_data osk_flash_data = {
+        .map_name       = "cfi_probe",
+        .width          = 2,
+        .parts          = osk_partitions,
+        .nr_parts       = ARRAY_SIZE(osk_partitions),
+};
+
+static struct resource osk_flash_resource = {
+        /* this is on CS3, wherever it's mapped */
+        .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device osk5912_flash_device = {
+        .name           = "omapflash",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &osk_flash_data,
+        },
+        .num_resources  = 1,
+        .resource       = &osk_flash_resource,
+};
 
 static struct resource osk5912_smc91x_resources[] = {
         [0] = {
@@ -86,9 +135,16 @@ static struct platform_device osk5912_cf_device = {
         .resource       = osk5912_cf_resources,
 };
 
+static struct platform_device osk5912_mcbsp1_device = {
+        .name           = "omap_mcbsp",
+        .id             = 1,
+};
+
 static struct platform_device *osk5912_devices[] __initdata = {
+        &osk5912_flash_device,
         &osk5912_smc91x_device,
         &osk5912_cf_device,
+        &osk5912_mcbsp1_device,
 };
 
 static void __init osk_init_smc91x(void)
@@ -97,7 +153,6 @@ static void __init osk_init_smc91x(void)
                 printk("Error requesting gpio 0 for smc91x irq\n");
                 return;
         }
-        omap_set_gpio_edge_ctrl(0, OMAP_GPIO_RISING_EDGE);
 
         /* Check EMIFS wait states to fix errors with SMC_GET_PKT_HDR */
         EMIFS_CCS(1) |= 0x2;
@@ -110,11 +165,11 @@ static void __init osk_init_cf(void)
                 printk("Error requesting gpio 62 for CF irq\n");
                 return;
         }
-        /* it's really active-low */
-        omap_set_gpio_edge_ctrl(62, OMAP_GPIO_FALLING_EDGE);
+        /* the CF I/O IRQ is really active-low */
+        set_irq_type(OMAP_GPIO_IRQ(62), IRQT_FALLING);
 }
 
-void osk_init_irq(void)
+static void __init osk_init_irq(void)
 {
         omap_init_irq();
         omap_gpio_init();
@@ -142,18 +197,69 @@ static struct omap_board_config_kernel osk_config[] = {
         { OMAP_TAG_USB,           &osk_usb_config },
 };
 
+#ifdef  CONFIG_OMAP_OSK_MISTRAL
+
+#ifdef  CONFIG_PM
+static irqreturn_t
+osk_mistral_wake_interrupt(int irq, void *ignored, struct pt_regs *regs)
+{
+        return IRQ_HANDLED;
+}
+#endif
+
+static void __init osk_mistral_init(void)
+{
+        /* FIXME here's where to feed in framebuffer, touchpad, and
+         * keyboard setup ...  not in the drivers for those devices!
+         *
+         * NOTE:  we could actually tell if there's a Mistral board
+         * attached, e.g. by trying to read something from the ads7846.
+         * But this is too early for that...
+         */
+
+        /* the sideways button (SW1) is for use as a "wakeup" button */
+        omap_cfg_reg(N15_1610_MPUIO2);
+        if (omap_request_gpio(OMAP_MPUIO(2)) == 0) {
+                int ret = 0;
+                omap_set_gpio_direction(OMAP_MPUIO(2), 1);
+                set_irq_type(OMAP_GPIO_IRQ(OMAP_MPUIO(2)), IRQT_RISING);
+#ifdef  CONFIG_PM
+                /* share the IRQ in case someone wants to use the
+                 * button for more than wakeup from system sleep.
+                 */
+                ret = request_irq(OMAP_GPIO_IRQ(OMAP_MPUIO(2)),
+                                &osk_mistral_wake_interrupt,
+                                SA_SHIRQ, "mistral_wakeup",
+                                &osk_mistral_wake_interrupt);
+                if (ret != 0) {
+                        omap_free_gpio(OMAP_MPUIO(2));
+                        printk(KERN_ERR "OSK+Mistral: no wakeup irq, %d?\n",
+                                ret);
+                } else
+                        enable_irq_wake(OMAP_GPIO_IRQ(OMAP_MPUIO(2)));
+#endif
+        } else
+                printk(KERN_ERR "OSK+Mistral: wakeup button is awol\n");
+}
+#else
+static void __init osk_mistral_init(void) { }
+#endif
+
 static void __init osk_init(void)
 {
+        osk_flash_resource.end = osk_flash_resource.start = omap_cs3_phys();
+        osk_flash_resource.end += SZ_32M - 1;
         platform_add_devices(osk5912_devices, ARRAY_SIZE(osk5912_devices));
         omap_board_config = osk_config;
         omap_board_config_size = ARRAY_SIZE(osk_config);
         USB_TRANSCEIVER_CTRL_REG |= (3 << 1);
+
+        osk_mistral_init();
 }
 
 static void __init osk_map_io(void)
 {
         omap_map_common_io();
-        iotable_init(osk5912_io_desc, ARRAY_SIZE(osk5912_io_desc));
         omap_serial_init(osk_serial_ports);
 }