5 files changed, 60 insertions, 14 deletions

diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index 7cdcb459ea9d..6a830853aa6a 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -5,9 +5,9 @@
 # Common support (must be linked before board specific support)
 obj-y                           += clock.o devices.o generic.o irq.o dma.o \
                                    time.o gpio.o
-obj-$(CONFIG_PXA25x)            += pxa25x.o mfp-pxa2xx.o
-obj-$(CONFIG_PXA27x)            += pxa27x.o mfp-pxa2xx.o
-obj-$(CONFIG_PXA3xx)            += pxa3xx.o mfp-pxa3xx.o smemc.o
+obj-$(CONFIG_PXA25x)            += mfp-pxa2xx.o pxa25x.o
+obj-$(CONFIG_PXA27x)            += mfp-pxa2xx.o pxa27x.o
+obj-$(CONFIG_PXA3xx)            += mfp-pxa3xx.o pxa3xx.o smemc.o
 obj-$(CONFIG_CPU_PXA300)        += pxa300.o
 obj-$(CONFIG_CPU_PXA320)        += pxa320.o
 
diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
index f01d18544133..bdf239754037 100644
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -40,6 +40,7 @@
 
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/pxa2xx-regs.h>
+#include <asm/arch/pxa2xx-gpio.h>
 
 #include "generic.h"
 
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index d70be75bd199..badba064dc04 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -114,6 +114,14 @@ static unsigned long magician_pin_config[] = {
         GPIO82_CIF_DD_5,
         GPIO84_CIF_FV,
         GPIO85_CIF_LV,
+
+        /* Magician specific input GPIOs */
+        GPIO9_GPIO,     /* unknown */
+        GPIO10_GPIO,    /* GSM_IRQ */
+        GPIO13_GPIO,    /* CPLD_IRQ */
+        GPIO107_GPIO,   /* DS1WM_IRQ */
+        GPIO108_GPIO,   /* GSM_READY */
+        GPIO115_GPIO,   /* nPEN_IRQ */
 };
 
 /*
@@ -438,7 +446,7 @@ static struct pasic3_led pasic3_leds[] = {
 
 static struct platform_device pasic3;
 
-static struct pasic3_leds_machinfo __devinit pasic3_leds_info = {
+static struct pasic3_leds_machinfo pasic3_leds_info = {
         .num_leds   = ARRAY_SIZE(pasic3_leds),
         .power_gpio = EGPIO_MAGICIAN_LED_POWER,
         .leds       = pasic3_leds,
@@ -543,9 +551,28 @@ static struct platform_device power_supply = {
 static int magician_mci_init(struct device *dev,
                                 irq_handler_t detect_irq, void *data)
 {
-        return request_irq(IRQ_MAGICIAN_SD, detect_irq,
+        int err;
+
+        err = request_irq(IRQ_MAGICIAN_SD, detect_irq,
                                 IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
                                 "MMC card detect", data);
+        if (err)
+                goto err_request_irq;
+        err = gpio_request(EGPIO_MAGICIAN_SD_POWER, "SD_POWER");
+        if (err)
+                goto err_request_power;
+        err = gpio_request(EGPIO_MAGICIAN_nSD_READONLY, "nSD_READONLY");
+        if (err)
+                goto err_request_readonly;
+
+        return 0;
+
+err_request_readonly:
+        gpio_free(EGPIO_MAGICIAN_SD_POWER);
+err_request_power:
+        free_irq(IRQ_MAGICIAN_SD, data);
+err_request_irq:
+        return err;
 }
 
 static void magician_mci_setpower(struct device *dev, unsigned int vdd)
@@ -562,6 +589,8 @@ static int magician_mci_get_ro(struct device *dev)
 
 static void magician_mci_exit(struct device *dev, void *data)
 {
+        gpio_free(EGPIO_MAGICIAN_nSD_READONLY);
+        gpio_free(EGPIO_MAGICIAN_SD_POWER);
         free_irq(IRQ_MAGICIAN_SD, data);
 }
 
@@ -643,28 +672,42 @@ static void __init magician_init(void)
 {
         void __iomem *cpld;
         int lcd_select;
+        int err;
+
+        gpio_request(GPIO13_MAGICIAN_CPLD_IRQ, "CPLD_IRQ");
+        gpio_request(GPIO107_MAGICIAN_DS1WM_IRQ, "DS1WM_IRQ");
 
         pxa2xx_mfp_config(ARRAY_AND_SIZE(magician_pin_config));
 
         platform_add_devices(devices, ARRAY_SIZE(devices));
+
+        err = gpio_request(GPIO83_MAGICIAN_nIR_EN, "nIR_EN");
+        if (!err) {
+                gpio_direction_output(GPIO83_MAGICIAN_nIR_EN, 1);
+                pxa_set_ficp_info(&magician_ficp_info);
+        }
         pxa_set_i2c_info(NULL);
         pxa_set_mci_info(&magician_mci_info);
         pxa_set_ohci_info(&magician_ohci_info);
-        pxa_set_ficp_info(&magician_ficp_info);
 
         /* Check LCD type we have */
         cpld = ioremap_nocache(PXA_CS3_PHYS, 0x1000);
         if (cpld) {
                 u8 board_id = __raw_readb(cpld+0x14);
+                iounmap(cpld);
                 system_rev = board_id & 0x7;
                 lcd_select = board_id & 0x8;
-                iounmap(cpld);
                 pr_info("LCD type: %s\n", lcd_select ? "Samsung" : "Toppoly");
-                if (lcd_select && (system_rev < 3))
-                        pxa_gpio_mode(GPIO75_MAGICIAN_SAMSUNG_POWER_MD);
-                pxa_gpio_mode(GPIO104_MAGICIAN_LCD_POWER_1_MD);
-                pxa_gpio_mode(GPIO105_MAGICIAN_LCD_POWER_2_MD);
-                pxa_gpio_mode(GPIO106_MAGICIAN_LCD_POWER_3_MD);
+                if (lcd_select && (system_rev < 3)) {
+                        gpio_request(GPIO75_MAGICIAN_SAMSUNG_POWER, "SAMSUNG_POWER");
+                        gpio_direction_output(GPIO75_MAGICIAN_SAMSUNG_POWER, 0);
+                }
+                gpio_request(GPIO104_MAGICIAN_LCD_POWER_1, "LCD_POWER_1");
+                gpio_request(GPIO105_MAGICIAN_LCD_POWER_2, "LCD_POWER_2");
+                gpio_request(GPIO106_MAGICIAN_LCD_POWER_3, "LCD_POWER_3");
+                gpio_direction_output(GPIO104_MAGICIAN_LCD_POWER_1, 0);
+                gpio_direction_output(GPIO105_MAGICIAN_LCD_POWER_2, 0);
+                gpio_direction_output(GPIO106_MAGICIAN_LCD_POWER_3, 0);
                 set_pxa_fb_info(lcd_select ? &samsung_info : &toppoly_info);
         } else
                 pr_err("LCD detection: CPLD mapping failed\n");
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index 039194cbe477..ec1bbf333a3a 100644
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -46,8 +46,8 @@ int pxa_pm_enter(suspend_state_t state)
                         sleep_save_checksum += sleep_save[i];
         }
 
-        /* Clear sleep reset status */
-        RCSR = RCSR_SMR;
+        /* Clear reset status */
+        RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
 
         /* *** go zzz *** */
         pxa_cpu_pm_fns->enter(state);
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index dde355e88fa1..b6a6f5fcc77a 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -486,6 +486,8 @@ static int pxa3xx_set_wake(unsigned int irq, unsigned int on)
         case IRQ_MMC3:
                 mask = ADXER_MFP_GEN12;
                 break;
+        default:
+                return -EINVAL;
         }
 
         local_irq_save(flags);