Merge branch 'for-next' of git://git.o-hand.com/linux-mfd

* 'for-next' of git://git.o-hand.com/linux-mfd:
  mfd: further unbork the ucb1400 ac97_bus dependencies
  mfd: ucb1400 needs GPIO
  mfd: ucb1400 sound driver uses/depends on AC97_BUS:
  mfd: Don't use NO_IRQ in WM8350
  mfd: update TMIO drivers to use the clock API
  mfd: twl4030-core irq simplification
  mfd: add base support for Dialog DA9030/DA9034 PMICs
  mfd: TWL4030 core driver
  mfd: support tmiofb cell on tc6393xb
  mfd: add OHCI cell to tc6393xb
  mfd: Fix htc-egpio compile warning
  mfd: do tcb6393xb state restore on resume only if requested
  mfd: provide and use setup hook for tc6393xb
  mfd: update sm501 debugging/low information messages
  mfd: reduce stack usage in mfd-core.c

2 files changed, 31 insertions, 8 deletions

diff --git a/arch/arm/mach-pxa/include/mach/tosa.h b/arch/arm/mach-pxa/include/mach/tosa.h
index a72803f0461b..8bce6d8615b9 100644
--- a/arch/arm/mach-pxa/include/mach/tosa.h
+++ b/arch/arm/mach-pxa/include/mach/tosa.h
@@ -59,8 +59,6 @@
  * TC6393XB GPIOs
  */
 #define TOSA_TC6393XB_GPIO_BASE         (NR_BUILTIN_GPIO + 2 * 12)
-#define TOSA_TC6393XB_GPIO(i)           (TOSA_TC6393XB_GPIO_BASE + (i))
-#define TOSA_TC6393XB_GPIO_BIT(gpio)    (1 << (gpio - TOSA_TC6393XB_GPIO_BASE))
 
 #define TOSA_GPIO_TG_ON                 (TOSA_TC6393XB_GPIO_BASE + 0)
 #define TOSA_GPIO_L_MUTE                (TOSA_TC6393XB_GPIO_BASE + 1)
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 130e37e4ebdd..a6c4694359ca 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -706,16 +706,39 @@ static struct tmio_nand_data tosa_tc6393xb_nand_config = {
         .badblock_pattern = &tosa_tc6393xb_nand_bbt,
 };
 
-static struct tc6393xb_platform_data tosa_tc6393xb_setup = {
+static int tosa_tc6393xb_setup(struct platform_device *dev)
+{
+        int rc;
+
+        rc = gpio_request(TOSA_GPIO_CARD_VCC_ON, "CARD_VCC_ON");
+        if (rc)
+                goto err_req;
+
+        rc = gpio_direction_output(TOSA_GPIO_CARD_VCC_ON, 1);
+        if (rc)
+                goto err_dir;
+
+        return rc;
+
+err_dir:
+        gpio_free(TOSA_GPIO_CARD_VCC_ON);
+err_req:
+        return rc;
+}
+
+static void tosa_tc6393xb_teardown(struct platform_device *dev)
+{
+        gpio_free(TOSA_GPIO_CARD_VCC_ON);
+}
+
+static struct tc6393xb_platform_data tosa_tc6393xb_data = {
         .scr_pll2cr     = 0x0cc1,
         .scr_gper       = 0x3300,
-        .scr_gpo_dsr    =
-                TOSA_TC6393XB_GPIO_BIT(TOSA_GPIO_CARD_VCC_ON),
-        .scr_gpo_doecr  =
-                TOSA_TC6393XB_GPIO_BIT(TOSA_GPIO_CARD_VCC_ON),
 
         .irq_base       = IRQ_BOARD_START,
         .gpio_base      = TOSA_TC6393XB_GPIO_BASE,
+        .setup          = tosa_tc6393xb_setup,
+        .teardown       = tosa_tc6393xb_teardown,
 
         .enable         = tosa_tc6393xb_enable,
         .disable        = tosa_tc6393xb_disable,
@@ -723,6 +746,8 @@ static struct tc6393xb_platform_data tosa_tc6393xb_setup = {
         .resume         = tosa_tc6393xb_resume,
 
         .nand_data      = &tosa_tc6393xb_nand_config,
+
+        .resume_restore = 1,
 };
 
 
@@ -730,7 +755,7 @@ static struct platform_device tc6393xb_device = {
         .name   = "tc6393xb",
         .id     = -1,
         .dev    = {
-                .platform_data  = &tosa_tc6393xb_setup,
+                .platform_data  = &tosa_tc6393xb_data,
         },
         .num_resources  = ARRAY_SIZE(tc6393xb_resources),
         .resource       = tc6393xb_resources,