1 files changed, 8 insertions, 108 deletions

diff --git a/arch/arm/mach-pxa/palmz72.c b/arch/arm/mach-pxa/palmz72.c
index c3645aa3fa3d..c2bf493c5f53 100644
--- a/arch/arm/mach-pxa/palmz72.c
+++ b/arch/arm/mach-pxa/palmz72.c
@@ -129,88 +129,14 @@ static unsigned long palmz72_pin_config[] __initdata = {
 /******************************************************************************
  * SD/MMC card controller
  ******************************************************************************/
-static int palmz72_mci_init(struct device *dev,
-                                irq_handler_t palmz72_detect_int, void *data)
-{
-        int err = 0;
-
-        /* Setup an interrupt for detecting card insert/remove events */
-        err = gpio_request(GPIO_NR_PALMZ72_SD_DETECT_N, "SD IRQ");
-        if (err)
-                goto err;
-        err = gpio_direction_input(GPIO_NR_PALMZ72_SD_DETECT_N);
-        if (err)
-                goto err2;
-        err = request_irq(gpio_to_irq(GPIO_NR_PALMZ72_SD_DETECT_N),
-                        palmz72_detect_int, IRQF_DISABLED | IRQF_SAMPLE_RANDOM |
-                        IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
-                        "SD/MMC card detect", data);
-        if (err) {
-                printk(KERN_ERR "%s: cannot request SD/MMC card detect IRQ\n",
-                                __func__);
-                goto err2;
-        }
-
-        /* SD_POWER is not actually power, but it is more like chip
-         * select, i.e. it is inverted */
-
-        err = gpio_request(GPIO_NR_PALMZ72_SD_POWER_N, "SD_POWER");
-        if (err)
-                goto err3;
-        err = gpio_direction_output(GPIO_NR_PALMZ72_SD_POWER_N, 0);
-        if (err)
-                goto err4;
-        err = gpio_request(GPIO_NR_PALMZ72_SD_RO, "SD_RO");
-        if (err)
-                goto err4;
-        err = gpio_direction_input(GPIO_NR_PALMZ72_SD_RO);
-        if (err)
-                goto err5;
-
-        printk(KERN_DEBUG "%s: irq registered\n", __func__);
-
-        return 0;
-
-err5:
-        gpio_free(GPIO_NR_PALMZ72_SD_RO);
-err4:
-        gpio_free(GPIO_NR_PALMZ72_SD_POWER_N);
-err3:
-        free_irq(gpio_to_irq(GPIO_NR_PALMZ72_SD_DETECT_N), data);
-err2:
-        gpio_free(GPIO_NR_PALMZ72_SD_DETECT_N);
-err:
-        return err;
-}
-
-static void palmz72_mci_exit(struct device *dev, void *data)
-{
-        gpio_free(GPIO_NR_PALMZ72_SD_POWER_N);
-        free_irq(gpio_to_irq(GPIO_NR_PALMZ72_SD_DETECT_N), data);
-        gpio_free(GPIO_NR_PALMZ72_SD_DETECT_N);
-        gpio_free(GPIO_NR_PALMZ72_SD_RO);
-}
-
-static void palmz72_mci_power(struct device *dev, unsigned int vdd)
-{
-        struct pxamci_platform_data *p_d = dev->platform_data;
-        if (p_d->ocr_mask & (1 << vdd))
-                gpio_set_value(GPIO_NR_PALMZ72_SD_POWER_N, 0);
-        else
-                gpio_set_value(GPIO_NR_PALMZ72_SD_POWER_N, 1);
-}
-
-static int palmz72_mci_ro(struct device *dev)
-{
-        return gpio_get_value(GPIO_NR_PALMZ72_SD_RO);
-}
-
+/* SD_POWER is not actually power, but it is more like chip
+ * select, i.e. it is inverted */
 static struct pxamci_platform_data palmz72_mci_platform_data = {
-        .ocr_mask       = MMC_VDD_32_33 | MMC_VDD_33_34,
-        .setpower       = palmz72_mci_power,
-        .get_ro         = palmz72_mci_ro,
-        .init           = palmz72_mci_init,
-        .exit           = palmz72_mci_exit,
+        .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .gpio_card_detect       = GPIO_NR_PALMZ72_SD_DETECT_N,
+        .gpio_card_ro           = GPIO_NR_PALMZ72_SD_RO,
+        .gpio_power             = GPIO_NR_PALMZ72_SD_POWER_N,
+        .gpio_power_invert      = 1,
 };
 
 /******************************************************************************
@@ -304,35 +230,9 @@ static struct platform_device palmz72_backlight = {
 /******************************************************************************
  * IrDA
  ******************************************************************************/
-static int palmz72_irda_startup(struct device *dev)
-{
-        int err;
-        err = gpio_request(GPIO_NR_PALMZ72_IR_DISABLE, "IR DISABLE");
-        if (err)
-                goto err;
-        err = gpio_direction_output(GPIO_NR_PALMZ72_IR_DISABLE, 1);
-        if (err)
-                gpio_free(GPIO_NR_PALMZ72_IR_DISABLE);
-err:
-        return err;
-}
-
-static void palmz72_irda_shutdown(struct device *dev)
-{
-        gpio_free(GPIO_NR_PALMZ72_IR_DISABLE);
-}
-
-static void palmz72_irda_transceiver_mode(struct device *dev, int mode)
-{
-        gpio_set_value(GPIO_NR_PALMZ72_IR_DISABLE, mode & IR_OFF);
-        pxa2xx_transceiver_mode(dev, mode);
-}
-
 static struct pxaficp_platform_data palmz72_ficp_platform_data = {
-        .startup                = palmz72_irda_startup,
-        .shutdown               = palmz72_irda_shutdown,
+        .gpio_pwdown            = GPIO_NR_PALMZ72_IR_DISABLE,
         .transceiver_cap        = IR_SIRMODE | IR_OFF,
-        .transceiver_mode       = palmz72_irda_transceiver_mode,
 };
 
 /******************************************************************************