3 files changed, 73 insertions, 43 deletions

diff --git a/arch/arm/mach-pxa/include/mach/spitz.h b/arch/arm/mach-pxa/include/mach/spitz.h
index d2fc22df0d7f..e9b3d33daed6 100644
--- a/arch/arm/mach-pxa/include/mach/spitz.h
+++ b/arch/arm/mach-pxa/include/mach/spitz.h
@@ -16,6 +16,7 @@
 #endif
 
 #include <linux/fb.h>
+#include <linux/gpio.h>
 
 /* Spitz/Akita GPIOs */
 
@@ -107,6 +108,17 @@
 #define SPITZ_SCP_SUS_CLR     (SPITZ_SCP_MUTE_L | SPITZ_SCP_MUTE_R | SPITZ_SCP_JK_A | SPITZ_SCP_ADC_TEMP_ON)
 #define SPITZ_SCP_SUS_SET     0
 
+#define SPITZ_SCP_GPIO_BASE     (NR_BUILTIN_GPIO)
+#define SPITZ_GPIO_LED_GREEN    (SPITZ_SCP_GPIO_BASE + 0)
+#define SPITZ_GPIO_JK_B         (SPITZ_SCP_GPIO_BASE + 1)
+#define SPITZ_GPIO_CHRG_ON      (SPITZ_SCP_GPIO_BASE + 2)
+#define SPITZ_GPIO_MUTE_L       (SPITZ_SCP_GPIO_BASE + 3)
+#define SPITZ_GPIO_MUTE_R       (SPITZ_SCP_GPIO_BASE + 4)
+#define SPITZ_GPIO_CF_POWER     (SPITZ_SCP_GPIO_BASE + 5)
+#define SPITZ_GPIO_LED_ORANGE   (SPITZ_SCP_GPIO_BASE + 6)
+#define SPITZ_GPIO_JK_A         (SPITZ_SCP_GPIO_BASE + 7)
+#define SPITZ_GPIO_ADC_TEMP_ON  (SPITZ_SCP_GPIO_BASE + 8)
+
 /* Spitz Scoop Device (No. 2) GPIOs */
 /* Suspend States in comments */
 #define SPITZ_SCP2_IR_ON           SCOOP_GPCR_PA11  /* High */
@@ -128,6 +140,16 @@
                              SPITZ_SCP2_BACKLIGHT_CONT | SPITZ_SCP2_BACKLIGHT_ON | SPITZ_SCP2_MIC_BIAS)
 #define SPITZ_SCP2_SUS_SET  (SPITZ_SCP2_IR_ON | SPITZ_SCP2_RESERVED_1)
 
+#define SPITZ_SCP2_GPIO_BASE            (NR_BUILTIN_GPIO + 12)
+#define SPITZ_GPIO_IR_ON                (SPITZ_SCP2_GPIO_BASE + 0)
+#define SPITZ_GPIO_AKIN_PULLUP          (SPITZ_SCP2_GPIO_BASE + 1
+#define SPITZ_GPIO_RESERVED_1           (SPITZ_SCP2_GPIO_BASE + 2)
+#define SPITZ_GPIO_RESERVED_2           (SPITZ_SCP2_GPIO_BASE + 3)
+#define SPITZ_GPIO_RESERVED_3           (SPITZ_SCP2_GPIO_BASE + 4)
+#define SPITZ_GPIO_RESERVED_4           (SPITZ_SCP2_GPIO_BASE + 5)
+#define SPITZ_GPIO_BACKLIGHT_CONT       (SPITZ_SCP2_GPIO_BASE + 6)
+#define SPITZ_GPIO_BACKLIGHT_ON         (SPITZ_SCP2_GPIO_BASE + 7)
+#define SPITZ_GPIO_MIC_BIAS             (SPITZ_SCP2_GPIO_BASE + 8)
 
 /* Spitz IRQ Definitions */
 
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 8b06b7a749df..290008296e1b 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -134,10 +134,11 @@ static struct resource spitz_scoop_resources[] = {
 };
 
 static struct scoop_config spitz_scoop_setup = {
-        .io_dir         = SPITZ_SCP_IO_DIR,
+        .io_dir         = SPITZ_SCP_IO_DIR,
         .io_out         = SPITZ_SCP_IO_OUT,
-        .suspend_clr = SPITZ_SCP_SUS_CLR,
-        .suspend_set = SPITZ_SCP_SUS_SET,
+        .suspend_clr    = SPITZ_SCP_SUS_CLR,
+        .suspend_set    = SPITZ_SCP_SUS_SET,
+        .gpio_base      = SPITZ_SCP_GPIO_BASE,
 };
 
 struct platform_device spitzscoop_device = {
@@ -162,10 +163,11 @@ static struct resource spitz_scoop2_resources[] = {
 };
 
 static struct scoop_config spitz_scoop2_setup = {
-        .io_dir         = SPITZ_SCP2_IO_DIR,
+        .io_dir         = SPITZ_SCP2_IO_DIR,
         .io_out         = SPITZ_SCP2_IO_OUT,
-        .suspend_clr = SPITZ_SCP2_SUS_CLR,
-        .suspend_set = SPITZ_SCP2_SUS_SET,
+        .suspend_clr    = SPITZ_SCP2_SUS_CLR,
+        .suspend_set    = SPITZ_SCP2_SUS_SET,
+        .gpio_base      = SPITZ_SCP2_GPIO_BASE,
 };
 
 struct platform_device spitzscoop2_device = {
@@ -187,7 +189,7 @@ static void spitz_card_pwr_ctrl(int device, unsigned short new_cpr)
         unsigned short cpr = read_scoop_reg(&spitzscoop_device.dev, SCOOP_CPR);
 
         if (new_cpr & 0x0007) {
-                set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_CF_POWER);
+                gpio_set_value(SPITZ_GPIO_CF_POWER, 1);
                 if (!(cpr & 0x0002) && !(cpr & 0x0004))
                         mdelay(5);
                 if (device == SPITZ_PWR_CF)
@@ -203,7 +205,7 @@ static void spitz_card_pwr_ctrl(int device, unsigned short new_cpr)
                 if (!(cpr & 0x0002) && !(cpr & 0x0004)) {
                         write_scoop_reg(&spitzscoop_device.dev, SCOOP_CPR, 0x0000);
                         mdelay(1);
-                        reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_CF_POWER);
+                        gpio_set_value(SPITZ_GPIO_CF_POWER, 0);
                 } else {
                         write_scoop_reg(&spitzscoop_device.dev, SCOOP_CPR, cpr | new_cpr);
                 }
@@ -283,16 +285,8 @@ static struct pxa2xx_spi_chip spitz_ads7846_chip = {
 static void spitz_notify_intensity(int intensity)
 {
         if (machine_is_spitz() || machine_is_borzoi()) {
-                /* Bit 5 is via SCOOP */
-                if (intensity & 0x0020)
-                        reset_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_BACKLIGHT_CONT);
-                else
-                        set_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_BACKLIGHT_CONT);
-
-                if (intensity)
-                        set_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_BACKLIGHT_ON);
-                else
-                        reset_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_BACKLIGHT_ON);
+                gpio_set_value(SPITZ_GPIO_BACKLIGHT_CONT, !(intensity & 0x20));
+                gpio_set_value(SPITZ_GPIO_BACKLIGHT_ON, intensity);
                 return;
         }
 
@@ -515,12 +509,34 @@ static struct pxaohci_platform_data spitz_ohci_platform_data = {
 /*
  * Irda
  */
+static int spitz_irda_startup(struct device *dev)
+{
+        int rc;
+
+        rc = gpio_request(SPITZ_GPIO_IR_ON, "IrDA on");
+        if (rc)
+                goto err;
+
+        rc = gpio_direction_output(SPITZ_GPIO_IR_ON, 1);
+        if (rc)
+                goto err_dir;
+
+        return 0;
+
+err_dir:
+        gpio_free(SPITZ_GPIO_IR_ON);
+err:
+        return rc;
+}
+
+static void spitz_irda_shutdown(struct device *dev)
+{
+        gpio_free(SPITZ_GPIO_IR_ON);
+}
+
 static void spitz_irda_transceiver_mode(struct device *dev, int mode)
 {
-        if (mode & IR_OFF)
-                set_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_IR_ON);
-        else
-                reset_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_IR_ON);
+        gpio_set_value(SPITZ_GPIO_IR_ON, mode & IR_OFF);
         pxa2xx_transceiver_mode(dev, mode);
 }
 
@@ -536,8 +552,10 @@ static void akita_irda_transceiver_mode(struct device *dev, int mode)
 #endif
 
 static struct pxaficp_platform_data spitz_ficp_platform_data = {
-        .transceiver_cap  = IR_SIRMODE | IR_OFF,
-        .transceiver_mode = spitz_irda_transceiver_mode,
+        .transceiver_cap        = IR_SIRMODE | IR_OFF,
+        .transceiver_mode       = spitz_irda_transceiver_mode,
+        .startup                = spitz_irda_startup,
+        .shutdown               = spitz_irda_shutdown,
 };
 
 
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
index 8a40505dfd28..53018db106ac 100644
--- a/arch/arm/mach-pxa/spitz_pm.c
+++ b/arch/arm/mach-pxa/spitz_pm.c
@@ -21,7 +21,6 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
-#include <asm/hardware/scoop.h>
 
 #include <mach/sharpsl.h>
 #include <mach/spitz.h>
@@ -48,44 +47,35 @@ static void spitz_charger_init(void)
 
 static void spitz_measure_temp(int on)
 {
-        if (on)
-                set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_ADC_TEMP_ON);
-        else
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_ADC_TEMP_ON);
+        gpio_set_value(SPITZ_GPIO_ADC_TEMP_ON, on);
 }
 
 static void spitz_charge(int on)
 {
         if (on) {
                 if (sharpsl_pm.flags & SHARPSL_SUSPENDED) {
-                        set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_JK_B);
-                        reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_CHRG_ON);
+                        gpio_set_value(SPITZ_GPIO_JK_B, 1);
+                        gpio_set_value(SPITZ_GPIO_CHRG_ON, 0);
                 } else {
-                        reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_JK_B);
-                        reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_CHRG_ON);
+                        gpio_set_value(SPITZ_GPIO_JK_B, 0);
+                        gpio_set_value(SPITZ_GPIO_CHRG_ON, 0);
                 }
         } else {
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_JK_B);
-                set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_CHRG_ON);
+                gpio_set_value(SPITZ_GPIO_JK_B, 0);
+                gpio_set_value(SPITZ_GPIO_CHRG_ON, 1);
         }
 }
 
 static void spitz_discharge(int on)
 {
-        if (on)
-                set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_JK_A);
-        else
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_JK_A);
+        gpio_set_value(SPITZ_GPIO_JK_A, on);
 }
 
 /* HACK - For unknown reasons, accurate voltage readings are only made with a load
    on the power bus which the green led on spitz provides */
 static void spitz_discharge1(int on)
 {
-        if (on)
-                set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_LED_GREEN);
-        else
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_LED_GREEN);
+        gpio_set_value(SPITZ_GPIO_LED_GREEN, on);
 }
 
 static void spitz_presuspend(void)