MMC: Consolidate voltage definitions

Consolidate the list of available voltages.

Up until now, a separate set of defines has been
used for host->vdd than that used for the OCR
voltage mask values. Having two sets of defines
allows them to get out of sync and the current
sets are already inconsistent with one claiming
to describe ranges and the other specific voltages.

Only the SDHCI driver uses the host->vdd defines and
it is easily fixed to use the OCR defines.

Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 579142a7904b..a57f6a3d48d3 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -658,20 +658,17 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power)
 
         pwr = SDHCI_POWER_ON;
 
-        switch (power) {
-        case MMC_VDD_170:
-        case MMC_VDD_180:
-        case MMC_VDD_190:
+        switch (1 << power) {
+        case MMC_VDD_17_18:
+        case MMC_VDD_18_19:
                 pwr |= SDHCI_POWER_180;
                 break;
-        case MMC_VDD_290:
-        case MMC_VDD_300:
-        case MMC_VDD_310:
+        case MMC_VDD_29_30:
+        case MMC_VDD_30_31:
                 pwr |= SDHCI_POWER_300;
                 break;
-        case MMC_VDD_320:
-        case MMC_VDD_330:
-        case MMC_VDD_340:
+        case MMC_VDD_32_33:
+        case MMC_VDD_33_34:
                 pwr |= SDHCI_POWER_330;
                 break;
         default: