4 files changed, 95 insertions, 40 deletions

diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
index aac2cda60e0..102916f1e46 100644
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -43,10 +43,10 @@
 
 #define CM_X300_ETH_PHYS        0x08000010
 
-#define GPIO82_MMC2_IRQ         (82)
-#define GPIO85_MMC2_WP          (85)
+#define GPIO82_MMC_IRQ          (82)
+#define GPIO85_MMC_WP           (85)
 
-#define CM_X300_MMC2_IRQ        IRQ_GPIO(GPIO82_MMC2_IRQ)
+#define CM_X300_MMC_IRQ         IRQ_GPIO(GPIO82_MMC_IRQ)
 
 #define GPIO95_RTC_CS           (95)
 #define GPIO96_RTC_WR           (96)
@@ -292,37 +292,37 @@ static inline void cm_x300_init_nand(void) {}
 #endif
 
 #if defined(CONFIG_MMC) || defined(CONFIG_MMC_MODULE)
-/* The first MMC slot of CM-X300 is hardwired to Libertas card and has
+static struct pxamci_platform_data cm_x300_mci_platform_data = {
+        .detect_delay           = 20,
+        .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
+        .gpio_card_detect       = GPIO82_MMC_IRQ,
+        .gpio_card_ro           = GPIO85_MMC_WP,
+        .gpio_power             = -1,
+};
+
+/* The second MMC slot of CM-X300 is hardwired to Libertas card and has
    no detection/ro pins */
-static int cm_x300_mci_init(struct device *dev,
-                            irq_handler_t cm_x300_detect_int,
-                            void *data)
+static int cm_x300_mci2_init(struct device *dev,
+                             irq_handler_t cm_x300_detect_int,
+        void *data)
 {
         return 0;
 }
 
-static void cm_x300_mci_exit(struct device *dev, void *data)
+static void cm_x300_mci2_exit(struct device *dev, void *data)
 {
 }
 
-static struct pxamci_platform_data cm_x300_mci_platform_data = {
+static struct pxamci_platform_data cm_x300_mci2_platform_data = {
         .detect_delay           = 20,
         .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
-        .init                   = cm_x300_mci_init,
-        .exit                   = cm_x300_mci_exit,
+        .init                   = cm_x300_mci2_init,
+        .exit                   = cm_x300_mci2_exit,
         .gpio_card_detect       = -1,
         .gpio_card_ro           = -1,
         .gpio_power             = -1,
 };
 
-static struct pxamci_platform_data cm_x300_mci2_platform_data = {
-        .detect_delay           = 20,
-        .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
-        .gpio_card_detect       = GPIO82_MMC2_IRQ,
-        .gpio_card_ro           = GPIO85_MMC2_WP,
-        .gpio_power             = -1,
-};
-
 static void __init cm_x300_init_mmc(void)
 {
         pxa_set_mci_info(&cm_x300_mci_platform_data);
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index d694ce28966..6112af431fa 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -25,6 +25,8 @@
 
 #include "generic.h"
 
+#define MAX_INTERNAL_IRQS       128
+
 #define IRQ_BIT(n)      (((n) - PXA_IRQ(0)) & 0x1f)
 #define _ICMR(n)        (*((((n) - PXA_IRQ(0)) & ~0x1f) ? &ICMR2 : &ICMR))
 #define _ICLR(n)        (*((((n) - PXA_IRQ(0)) & ~0x1f) ? &ICLR2 : &ICLR))
@@ -122,6 +124,8 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn)
 {
         int irq, i;
 
+        BUG_ON(irq_nr > MAX_INTERNAL_IRQS);
+
         pxa_internal_irq_nr = irq_nr;
 
         for (irq = PXA_IRQ(0); irq < PXA_IRQ(irq_nr); irq += 32) {
@@ -149,7 +153,8 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn)
 }
 
 #ifdef CONFIG_PM
-static unsigned long saved_icmr[2];
+static unsigned long saved_icmr[MAX_INTERNAL_IRQS/32];
+static unsigned long saved_ipr[MAX_INTERNAL_IRQS];
 
 static int pxa_irq_suspend(struct sys_device *dev, pm_message_t state)
 {
@@ -159,6 +164,8 @@ static int pxa_irq_suspend(struct sys_device *dev, pm_message_t state)
                 saved_icmr[i] = _ICMR(irq);
                 _ICMR(irq) = 0;
         }
+        for (i = 0; i < pxa_internal_irq_nr; i++)
+                saved_ipr[i] = IPR(i);
 
         return 0;
 }
@@ -171,6 +178,8 @@ static int pxa_irq_resume(struct sys_device *dev)
                 _ICMR(irq) = saved_icmr[i];
                 _ICLR(irq) = 0;
         }
+        for (i = 0; i < pxa_internal_irq_nr; i++)
+                IPR(i) = saved_ipr[i];
 
         ICCR = 1;
         return 0;
diff --git a/arch/arm/mach-pxa/palmtc.c b/arch/arm/mach-pxa/palmtc.c
index bb2cc0dd44e..0b92291a58f 100644
--- a/arch/arm/mach-pxa/palmtc.c
+++ b/arch/arm/mach-pxa/palmtc.c
@@ -292,10 +292,10 @@ const static unsigned int palmtc_keypad_col_gpios[] = {
 
 static struct matrix_keypad_platform_data palmtc_keypad_platform_data = {
         .keymap_data    = &palmtc_keymap_data,
-        .col_gpios      = palmtc_keypad_row_gpios,
-        .num_col_gpios  = 12,
-        .row_gpios      = palmtc_keypad_col_gpios,
-        .num_row_gpios  = 4,
+        .row_gpios      = palmtc_keypad_row_gpios,
+        .num_row_gpios  = ARRAY_SIZE(palmtc_keypad_row_gpios),
+        .col_gpios      = palmtc_keypad_col_gpios,
+        .num_col_gpios  = ARRAY_SIZE(palmtc_keypad_col_gpios),
         .active_low     = 1,
 
         .debounce_ms            = 20,
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index ee8d6038ce8..3da45d05174 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
+#include <linux/gpio_keys.h>
 #include <linux/gpio.h>
 #include <linux/leds.h>
 #include <linux/mtd/physmap.h>
@@ -375,6 +376,43 @@ static struct platform_device spitzkbd_device = {
 };
 
 
+static struct gpio_keys_button spitz_gpio_keys[] = {
+        {
+                .type   = EV_PWR,
+                .code   = KEY_SUSPEND,
+                .gpio   = SPITZ_GPIO_ON_KEY,
+                .desc   = "On/Off",
+                .wakeup = 1,
+        },
+        /* Two buttons detecting the lid state */
+        {
+                .type   = EV_SW,
+                .code   = 0,
+                .gpio   = SPITZ_GPIO_SWA,
+                .desc   = "Display Down",
+        },
+        {
+                .type   = EV_SW,
+                .code   = 1,
+                .gpio   = SPITZ_GPIO_SWB,
+                .desc   = "Lid Closed",
+        },
+};
+
+static struct gpio_keys_platform_data spitz_gpio_keys_platform_data = {
+        .buttons        = spitz_gpio_keys,
+        .nbuttons       = ARRAY_SIZE(spitz_gpio_keys),
+};
+
+static struct platform_device spitz_gpio_keys_device = {
+        .name   = "gpio-keys",
+        .id     = -1,
+        .dev    = {
+                .platform_data  = &spitz_gpio_keys_platform_data,
+        },
+};
+
+
 /*
  * Spitz LEDs
  */
@@ -689,6 +727,7 @@ static struct platform_device sharpsl_rom_device = {
 static struct platform_device *devices[] __initdata = {
         &spitzscoop_device,
         &spitzkbd_device,
+        &spitz_gpio_keys_device,
         &spitzled_device,
         &sharpsl_nand_device,
         &sharpsl_rom_device,
@@ -740,11 +779,34 @@ static void __init common_init(void)
         pxa_set_i2c_info(NULL);
 }
 
+#if defined(CONFIG_MACH_AKITA) || defined(CONFIG_MACH_BORZOI)
+static struct nand_bbt_descr sharpsl_akita_bbt = {
+        .options = 0,
+        .offs = 4,
+        .len = 1,
+        .pattern = scan_ff_pattern
+};
+
+static struct nand_ecclayout akita_oobinfo = {
+        .eccbytes = 24,
+        .eccpos = {
+                   0x5, 0x1, 0x2, 0x3, 0x6, 0x7, 0x15, 0x11,
+                   0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23,
+                   0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37},
+        .oobfree = {{0x08, 0x09}}
+};
+#endif
+
 #if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI)
 static void __init spitz_init(void)
 {
         spitz_ficp_platform_data.gpio_pwdown = SPITZ_GPIO_IR_ON;
 
+        if (machine_is_borzoi()) {
+                sharpsl_nand_platform_data.badblock_pattern = &sharpsl_akita_bbt;
+                sharpsl_nand_platform_data.ecc_layout = &akita_oobinfo;
+        }
+
         platform_scoop_config = &spitz_pcmcia_config;
 
         common_init();
@@ -769,22 +831,6 @@ static struct i2c_board_info akita_i2c_board_info[] = {
         },
 };
 
-static struct nand_bbt_descr sharpsl_akita_bbt = {
-        .options = 0,
-        .offs = 4,
-        .len = 1,
-        .pattern = scan_ff_pattern
-};
-
-static struct nand_ecclayout akita_oobinfo = {
-        .eccbytes = 24,
-        .eccpos = {
-                   0x5, 0x1, 0x2, 0x3, 0x6, 0x7, 0x15, 0x11,
-                   0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23,
-                   0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37},
-        .oobfree = {{0x08, 0x09}}
-};
-
 static void __init akita_init(void)
 {
         spitz_ficp_platform_data.gpio_pwdown = AKITA_GPIO_IR_ON;