ARM: 7219/1: mmc: mmci: Change vdd_handler to a generic ios_handler

The purpose of the vdd_handler does not make sense. We remove it
and use a generic approach instead. A new ios_handler is added, the
purpose of which e.g. can be to control GPIO pins to a levelshifter.

Previously the vdd_handler was also used for making additional
changes to the power register bits. This option is superfluous and is
therefore removed.

Adaptaptions from the old vdd_handler to the new ios_handler is done for
mach-ux500 board, which was the only one using the vdd_handler.

This patch is based upon a patch from Sebastian Rasmussen.

Tested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sebastian Rasmussen <sebastian.rasmussen@stericsson.com>
Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index eb11ce61941d..0af1507d15c0 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1026,6 +1026,10 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
         unsigned long flags;
         int ret;
 
+        if (host->plat->ios_handler &&
+                host->plat->ios_handler(mmc_dev(mmc), ios))
+                        dev_err(mmc_dev(mmc), "platform ios_handler failed\n");
+
         switch (ios->power_mode) {
         case MMC_POWER_OFF:
                 if (host->vcc)
@@ -1045,10 +1049,6 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                                 return;
                         }
                 }
-                if (host->plat->vdd_handler)
-                        pwr |= host->plat->vdd_handler(mmc_dev(mmc), ios->vdd,
-                                                       ios->power_mode);
-
                 /*
                  * The ST Micro variant doesn't have the PL180s MCI_PWR_UP
                  * and instead uses MCI_PWR_ON so apply whatever value is