1 files changed, 131 insertions, 26 deletions

diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index db06dc910ba7..55836fa35060 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -25,6 +25,9 @@
 #include <linux/spi/ads7846.h>
 #include <linux/regulator/machine.h>
 #include <linux/i2c/twl.h>
+#include <linux/spi/wl12xx.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/nand.h>
 #include <linux/leds.h>
 #include <linux/input.h>
 #include <linux/input/matrix_keypad.h>
@@ -41,15 +44,49 @@
 #include <plat/mcspi.h>
 #include <plat/usb.h>
 #include <plat/display.h>
+#include <plat/nand.h>
 
 #include "mux.h"
 #include "sdram-micron-mt46h32m32lf-6.h"
 #include "hsmmc.h"
 
+#define PANDORA_WIFI_IRQ_GPIO           21
+#define PANDORA_WIFI_NRESET_GPIO        23
 #define OMAP3_PANDORA_TS_GPIO           94
 
-/* hardware debounce: (value + 1) * 31us */
-#define GPIO_DEBOUNCE_TIME              127
+#define NAND_BLOCK_SIZE                 SZ_128K
+
+static struct mtd_partition omap3pandora_nand_partitions[] = {
+        {
+                .name           = "xloader",
+                .offset         = 0,
+                .size           = 4 * NAND_BLOCK_SIZE,
+                .mask_flags     = MTD_WRITEABLE
+        }, {
+                .name           = "uboot",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = 15 * NAND_BLOCK_SIZE,
+        }, {
+                .name           = "uboot-env",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = 1 * NAND_BLOCK_SIZE,
+        }, {
+                .name           = "boot",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = 80 * NAND_BLOCK_SIZE,
+        }, {
+                .name           = "rootfs",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = MTDPART_SIZ_FULL,
+        },
+};
+
+static struct omap_nand_platform_data pandora_nand_data = {
+        .cs             = 0,
+        .devsize        = 1,    /* '0' for 8-bit, '1' for 16-bit device */
+        .parts          = omap3pandora_nand_partitions,
+        .nr_parts       = ARRAY_SIZE(omap3pandora_nand_partitions),
+};
 
 static struct gpio_led pandora_gpio_leds[] = {
         {
@@ -88,6 +125,7 @@ static struct platform_device pandora_leds_gpio = {
         .type           = ev_type,                              \
         .code           = ev_code,                              \
         .active_low     = act_low,                              \
+        .debounce_interval = 4,                                 \
         .desc           = "btn " descr,                         \
 }
 
@@ -99,14 +137,14 @@ static struct gpio_keys_button pandora_gpio_keys[] = {
         GPIO_BUTTON_LOW(103,    KEY_DOWN,       "down"),
         GPIO_BUTTON_LOW(96,     KEY_LEFT,       "left"),
         GPIO_BUTTON_LOW(98,     KEY_RIGHT,      "right"),
-        GPIO_BUTTON_LOW(109,    KEY_KP1,        "game 1"),
-        GPIO_BUTTON_LOW(111,    KEY_KP2,        "game 2"),
-        GPIO_BUTTON_LOW(106,    KEY_KP3,        "game 3"),
-        GPIO_BUTTON_LOW(101,    KEY_KP4,        "game 4"),
-        GPIO_BUTTON_LOW(102,    BTN_TL,         "l"),
-        GPIO_BUTTON_LOW(97,     BTN_TL2,        "l2"),
-        GPIO_BUTTON_LOW(105,    BTN_TR,         "r"),
-        GPIO_BUTTON_LOW(107,    BTN_TR2,        "r2"),
+        GPIO_BUTTON_LOW(109,    KEY_PAGEUP,     "game 1"),
+        GPIO_BUTTON_LOW(111,    KEY_END,        "game 2"),
+        GPIO_BUTTON_LOW(106,    KEY_PAGEDOWN,   "game 3"),
+        GPIO_BUTTON_LOW(101,    KEY_HOME,       "game 4"),
+        GPIO_BUTTON_LOW(102,    KEY_RIGHTSHIFT, "l"),
+        GPIO_BUTTON_LOW(97,     KEY_KPPLUS,     "l2"),
+        GPIO_BUTTON_LOW(105,    KEY_RIGHTCTRL,  "r"),
+        GPIO_BUTTON_LOW(107,    KEY_KPMINUS,    "r2"),
         GPIO_BUTTON_LOW(104,    KEY_LEFTCTRL,   "ctrl"),
         GPIO_BUTTON_LOW(99,     KEY_MENU,       "menu"),
         GPIO_BUTTON_LOW(176,    KEY_COFFEE,     "hold"),
@@ -127,14 +165,7 @@ static struct platform_device pandora_keys_gpio = {
         },
 };
 
-static void __init pandora_keys_gpio_init(void)
-{
-        /* set debounce time for GPIO banks 4 and 6 */
-        gpio_set_debounce(32 * 3, GPIO_DEBOUNCE_TIME);
-        gpio_set_debounce(32 * 5, GPIO_DEBOUNCE_TIME);
-}
-
-static int board_keymap[] = {
+static const uint32_t board_keymap[] = {
         /* row, col, code */
         KEY(0, 0, KEY_9),
         KEY(0, 1, KEY_8),
@@ -255,12 +286,33 @@ static struct omap2_hsmmc_info omap3pandora_mmc[] = {
 static int omap3pandora_twl_gpio_setup(struct device *dev,
                 unsigned gpio, unsigned ngpio)
 {
+        int ret, gpio_32khz;
+
         /* gpio + {0,1} is "mmc{0,1}_cd" (input/IRQ) */
         omap3pandora_mmc[0].gpio_cd = gpio + 0;
         omap3pandora_mmc[1].gpio_cd = gpio + 1;
         omap2_hsmmc_init(omap3pandora_mmc);
 
+        /* gpio + 13 drives 32kHz buffer for wifi module */
+        gpio_32khz = gpio + 13;
+        ret = gpio_request(gpio_32khz, "wifi 32kHz");
+        if (ret < 0) {
+                pr_err("Cannot get GPIO line %d, ret=%d\n", gpio_32khz, ret);
+                goto fail;
+        }
+
+        ret = gpio_direction_output(gpio_32khz, 1);
+        if (ret < 0) {
+                pr_err("Cannot set GPIO line %d, ret=%d\n", gpio_32khz, ret);
+                goto fail_direction;
+        }
+
         return 0;
+
+fail_direction:
+        gpio_free(gpio_32khz);
+fail:
+        return -ENODEV;
 }
 
 static struct twl4030_gpio_platform_data omap3pandora_gpio_data = {
@@ -539,10 +591,67 @@ static void __init omap3pandora_init_irq(void)
         omap_gpio_init();
 }
 
+static void pandora_wl1251_set_power(bool enable)
+{
+        /*
+         * Keep power always on until wl1251_sdio driver learns to re-init
+         * the chip after powering it down and back up.
+         */
+}
+
+static struct wl12xx_platform_data pandora_wl1251_pdata = {
+        .set_power      = pandora_wl1251_set_power,
+        .use_eeprom     = true,
+};
+
+static struct platform_device pandora_wl1251_data = {
+        .name           = "wl1251_data",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &pandora_wl1251_pdata,
+        },
+};
+
+static void pandora_wl1251_init(void)
+{
+        int ret;
+
+        ret = gpio_request(PANDORA_WIFI_IRQ_GPIO, "wl1251 irq");
+        if (ret < 0)
+                goto fail;
+
+        ret = gpio_direction_input(PANDORA_WIFI_IRQ_GPIO);
+        if (ret < 0)
+                goto fail_irq;
+
+        pandora_wl1251_pdata.irq = gpio_to_irq(PANDORA_WIFI_IRQ_GPIO);
+        if (pandora_wl1251_pdata.irq < 0)
+                goto fail_irq;
+
+        ret = gpio_request(PANDORA_WIFI_NRESET_GPIO, "wl1251 nreset");
+        if (ret < 0)
+                goto fail_irq;
+
+        /* start powered so that it probes with MMC subsystem */
+        ret = gpio_direction_output(PANDORA_WIFI_NRESET_GPIO, 1);
+        if (ret < 0)
+                goto fail_nreset;
+
+        return;
+
+fail_nreset:
+        gpio_free(PANDORA_WIFI_NRESET_GPIO);
+fail_irq:
+        gpio_free(PANDORA_WIFI_IRQ_GPIO);
+fail:
+        printk(KERN_ERR "wl1251 board initialisation failed\n");
+}
+
 static struct platform_device *omap3pandora_devices[] __initdata = {
         &pandora_leds_gpio,
         &pandora_keys_gpio,
         &pandora_dss_device,
+        &pandora_wl1251_data,
 };
 
 static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
@@ -575,6 +684,7 @@ static void __init omap3pandora_init(void)
 {
         omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
         omap3pandora_i2c_init();
+        pandora_wl1251_init();
         platform_add_devices(omap3pandora_devices,
                         ARRAY_SIZE(omap3pandora_devices));
         omap_serial_init();
@@ -582,25 +692,20 @@ static void __init omap3pandora_init(void)
                         ARRAY_SIZE(omap3pandora_spi_board_info));
         omap3pandora_ads7846_init();
         usb_ehci_init(&ehci_pdata);
-        pandora_keys_gpio_init();
         usb_musb_init(&musb_board_data);
+        gpmc_nand_init(&pandora_nand_data);
 
         /* Ensure SDRC pins are mux'd for self-refresh */
         omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
         omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
 }
 
-static void __init omap3pandora_map_io(void)
-{
-        omap2_set_globals_343x();
-        omap34xx_map_common_io();
-}
-
 MACHINE_START(OMAP3_PANDORA, "Pandora Handheld Console")
         .phys_io        = 0x48000000,
         .io_pg_offst    = ((0xfa000000) >> 18) & 0xfffc,
         .boot_params    = 0x80000100,
-        .map_io         = omap3pandora_map_io,
+        .map_io         = omap3_map_io,
+        .reserve        = omap_reserve,
         .init_irq       = omap3pandora_init_irq,
         .init_machine   = omap3pandora_init,
         .timer          = &omap_timer,