Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (417 commits)
  MAINTAINERS: EB110ATX is not ebsa110
  MAINTAINERS: update Eric Miao's email address and status
  fb: add support of LCD display controller on pxa168/910 (base layer)
  [ARM] 5552/1: ep93xx get_uart_rate(): use EP93XX_SYSCON_PWRCNT and EP93XX_SYSCON_PWRCN
  [ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routines
  [ARM] 5544/1: Trust PrimeCell resource sizes
  [ARM] pxa/sharpsl_pm: cleanup of gpio-related code.
  [ARM] pxa/sharpsl_pm: drop set_irq_type calls
  [ARM] pxa/sharpsl_pm: merge pxa-specific code into generic one
  [ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific
  [ARM] sa1100: remove unused collie_pm.c
  [ARM] pxa: fix the conflicting non-static declarations of global_gpios[]
  [ARM] 5550/1: Add default configure file for w90p910 platform
  [ARM] 5549/1: Add clock api for w90p910 platform.
  [ARM] 5548/1: Add gpio api for w90p910 platform
  [ARM] 5551/1: Add multi-function pin api for w90p910 platform.
  [ARM] Make ARM_VIC_NR depend on ARM_VIC
  [ARM] 5546/1: ARM PL022 SSP/SPI driver v3
  ARM: OMAP4: SMP: Update defconfig for OMAP4430
  ARM: OMAP4: SMP: Enable SMP support for OMAP4430
  ...

1 files changed, 196 insertions, 1 deletions

diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index 402f09c6cf10..e32aa23ce962 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -23,7 +23,11 @@
 
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
+#include <linux/regulator/machine.h>
 #include <linux/i2c/twl4030.h>
+#include <linux/leds.h>
+#include <linux/input.h>
+#include <linux/gpio_keys.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -35,11 +39,154 @@
 #include <mach/hardware.h>
 #include <mach/mcspi.h>
 #include <mach/usb.h>
+#include <mach/keypad.h>
 
+#include "sdram-micron-mt46h32m32lf-6.h"
 #include "mmc-twl4030.h"
 
 #define OMAP3_PANDORA_TS_GPIO           94
 
+/* hardware debounce: (value + 1) * 31us */
+#define GPIO_DEBOUNCE_TIME              127
+
+static struct gpio_led pandora_gpio_leds[] = {
+        {
+                .name                   = "pandora::sd1",
+                .default_trigger        = "mmc0",
+                .gpio                   = 128,
+        }, {
+                .name                   = "pandora::sd2",
+                .default_trigger        = "mmc1",
+                .gpio                   = 129,
+        }, {
+                .name                   = "pandora::bluetooth",
+                .gpio                   = 158,
+        }, {
+                .name                   = "pandora::wifi",
+                .gpio                   = 159,
+        },
+};
+
+static struct gpio_led_platform_data pandora_gpio_led_data = {
+        .leds           = pandora_gpio_leds,
+        .num_leds       = ARRAY_SIZE(pandora_gpio_leds),
+};
+
+static struct platform_device pandora_leds_gpio = {
+        .name   = "leds-gpio",
+        .id     = -1,
+        .dev    = {
+                .platform_data  = &pandora_gpio_led_data,
+        },
+};
+
+#define GPIO_BUTTON(gpio_num, ev_type, ev_code, act_low, descr) \
+{                                                               \
+        .gpio           = gpio_num,                             \
+        .type           = ev_type,                              \
+        .code           = ev_code,                              \
+        .active_low     = act_low,                              \
+        .desc           = "btn " descr,                         \
+}
+
+#define GPIO_BUTTON_LOW(gpio_num, event_code, description)      \
+        GPIO_BUTTON(gpio_num, EV_KEY, event_code, 1, description)
+
+static struct gpio_keys_button pandora_gpio_keys[] = {
+        GPIO_BUTTON_LOW(110,    KEY_UP,         "up"),
+        GPIO_BUTTON_LOW(103,    KEY_DOWN,       "down"),
+        GPIO_BUTTON_LOW(96,     KEY_LEFT,       "left"),
+        GPIO_BUTTON_LOW(98,     KEY_RIGHT,      "right"),
+        GPIO_BUTTON_LOW(111,    BTN_A,          "a"),
+        GPIO_BUTTON_LOW(106,    BTN_B,          "b"),
+        GPIO_BUTTON_LOW(109,    BTN_X,          "x"),
+        GPIO_BUTTON_LOW(101,    BTN_Y,          "y"),
+        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(104,    KEY_LEFTCTRL,   "ctrl"),
+        GPIO_BUTTON_LOW(99,     KEY_MENU,       "menu"),
+        GPIO_BUTTON_LOW(176,    KEY_COFFEE,     "hold"),
+        GPIO_BUTTON(100, EV_KEY, KEY_LEFTALT, 0, "alt"),
+        GPIO_BUTTON(108, EV_SW, SW_LID, 1, "lid"),
+};
+
+static struct gpio_keys_platform_data pandora_gpio_key_info = {
+        .buttons        = pandora_gpio_keys,
+        .nbuttons       = ARRAY_SIZE(pandora_gpio_keys),
+};
+
+static struct platform_device pandora_keys_gpio = {
+        .name   = "gpio-keys",
+        .id     = -1,
+        .dev    = {
+                .platform_data  = &pandora_gpio_key_info,
+        },
+};
+
+static void __init pandora_keys_gpio_init(void)
+{
+        /* set debounce time for GPIO banks 4 and 6 */
+        omap_set_gpio_debounce_time(32 * 3, GPIO_DEBOUNCE_TIME);
+        omap_set_gpio_debounce_time(32 * 5, GPIO_DEBOUNCE_TIME);
+}
+
+static int pandora_keypad_map[] = {
+        /* col, row, code */
+        KEY(0, 0, KEY_9),
+        KEY(0, 1, KEY_0),
+        KEY(0, 2, KEY_BACKSPACE),
+        KEY(0, 3, KEY_O),
+        KEY(0, 4, KEY_P),
+        KEY(0, 5, KEY_K),
+        KEY(0, 6, KEY_L),
+        KEY(0, 7, KEY_ENTER),
+        KEY(1, 0, KEY_8),
+        KEY(1, 1, KEY_7),
+        KEY(1, 2, KEY_6),
+        KEY(1, 3, KEY_5),
+        KEY(1, 4, KEY_4),
+        KEY(1, 5, KEY_3),
+        KEY(1, 6, KEY_2),
+        KEY(1, 7, KEY_1),
+        KEY(2, 0, KEY_I),
+        KEY(2, 1, KEY_U),
+        KEY(2, 2, KEY_Y),
+        KEY(2, 3, KEY_T),
+        KEY(2, 4, KEY_R),
+        KEY(2, 5, KEY_E),
+        KEY(2, 6, KEY_W),
+        KEY(2, 7, KEY_Q),
+        KEY(3, 0, KEY_J),
+        KEY(3, 1, KEY_H),
+        KEY(3, 2, KEY_G),
+        KEY(3, 3, KEY_F),
+        KEY(3, 4, KEY_D),
+        KEY(3, 5, KEY_S),
+        KEY(3, 6, KEY_A),
+        KEY(3, 7, KEY_LEFTSHIFT),
+        KEY(4, 0, KEY_N),
+        KEY(4, 1, KEY_B),
+        KEY(4, 2, KEY_V),
+        KEY(4, 3, KEY_C),
+        KEY(4, 4, KEY_X),
+        KEY(4, 5, KEY_Z),
+        KEY(4, 6, KEY_DOT),
+        KEY(4, 7, KEY_COMMA),
+        KEY(5, 0, KEY_M),
+        KEY(5, 1, KEY_SPACE),
+        KEY(5, 2, KEY_FN),
+};
+
+static struct twl4030_keypad_data pandora_kp_data = {
+        .rows           = 8,
+        .cols           = 6,
+        .keymap         = pandora_keypad_map,
+        .keymapsize     = ARRAY_SIZE(pandora_keypad_map),
+        .rep            = 1,
+};
+
 static struct twl4030_hsmmc_info omap3pandora_mmc[] = {
         {
                 .mmc            = 1,
@@ -69,6 +216,14 @@ static struct omap_uart_config omap3pandora_uart_config __initdata = {
         .enabled_uarts  = (1 << 2), /* UART3 */
 };
 
+static struct regulator_consumer_supply pandora_vmmc1_supply = {
+        .supply                 = "vmmc",
+};
+
+static struct regulator_consumer_supply pandora_vmmc2_supply = {
+        .supply                 = "vmmc",
+};
+
 static int omap3pandora_twl_gpio_setup(struct device *dev,
                 unsigned gpio, unsigned ngpio)
 {
@@ -77,6 +232,10 @@ static int omap3pandora_twl_gpio_setup(struct device *dev,
         omap3pandora_mmc[1].gpio_cd = gpio + 1;
         twl4030_mmc_init(omap3pandora_mmc);
 
+        /* link regulators to MMC adapters */
+        pandora_vmmc1_supply.dev = omap3pandora_mmc[0].dev;
+        pandora_vmmc2_supply.dev = omap3pandora_mmc[1].dev;
+
         return 0;
 }
 
@@ -87,6 +246,36 @@ static struct twl4030_gpio_platform_data omap3pandora_gpio_data = {
         .setup          = omap3pandora_twl_gpio_setup,
 };
 
+/* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
+static struct regulator_init_data pandora_vmmc1 = {
+        .constraints = {
+                .min_uV                 = 1850000,
+                .max_uV                 = 3150000,
+                .valid_modes_mask       = REGULATOR_MODE_NORMAL
+                                        | REGULATOR_MODE_STANDBY,
+                .valid_ops_mask         = REGULATOR_CHANGE_VOLTAGE
+                                        | REGULATOR_CHANGE_MODE
+                                        | REGULATOR_CHANGE_STATUS,
+        },
+        .num_consumer_supplies  = 1,
+        .consumer_supplies      = &pandora_vmmc1_supply,
+};
+
+/* VMMC2 for MMC2 pins CMD, CLK, DAT0..DAT3 (max 100 mA) */
+static struct regulator_init_data pandora_vmmc2 = {
+        .constraints = {
+                .min_uV                 = 1850000,
+                .max_uV                 = 3150000,
+                .valid_modes_mask       = REGULATOR_MODE_NORMAL
+                                        | REGULATOR_MODE_STANDBY,
+                .valid_ops_mask         = REGULATOR_CHANGE_VOLTAGE
+                                        | REGULATOR_CHANGE_MODE
+                                        | REGULATOR_CHANGE_STATUS,
+        },
+        .num_consumer_supplies  = 1,
+        .consumer_supplies      = &pandora_vmmc2_supply,
+};
+
 static struct twl4030_usb_data omap3pandora_usb_data = {
         .usb_mode       = T2_USB_MODE_ULPI,
 };
@@ -96,6 +285,9 @@ static struct twl4030_platform_data omap3pandora_twldata = {
         .irq_end        = TWL4030_IRQ_END,
         .gpio           = &omap3pandora_gpio_data,
         .usb            = &omap3pandora_usb_data,
+        .vmmc1          = &pandora_vmmc1,
+        .vmmc2          = &pandora_vmmc2,
+        .keypad         = &pandora_kp_data,
 };
 
 static struct i2c_board_info __initdata omap3pandora_i2c_boardinfo[] = {
@@ -118,7 +310,7 @@ static int __init omap3pandora_i2c_init(void)
 
 static void __init omap3pandora_init_irq(void)
 {
-        omap2_init_common_hw(NULL);
+        omap2_init_common_hw(mt46h32m32lf6_sdrc_params);
         omap_init_irq();
         omap_gpio_init();
 }
@@ -188,6 +380,8 @@ static struct omap_board_config_kernel omap3pandora_config[] __initdata = {
 
 static struct platform_device *omap3pandora_devices[] __initdata = {
         &omap3pandora_lcd_device,
+        &pandora_leds_gpio,
+        &pandora_keys_gpio,
 };
 
 static void __init omap3pandora_init(void)
@@ -201,6 +395,7 @@ static void __init omap3pandora_init(void)
         spi_register_board_info(omap3pandora_spi_board_info,
                         ARRAY_SIZE(omap3pandora_spi_board_info));
         omap3pandora_ads7846_init();
+        pandora_keys_gpio_init();
         usb_musb_init();
 }