Merge branch 'fixes' into next

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 357b365..dbe8799 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2039,6 +2039,12 @@ void sdhci_set_power_noreg(struct sdhci_host *host, unsigned char mode,
                        break;
                case MMC_VDD_32_33:
                case MMC_VDD_33_34:
+               /*
+                * 3.4 ~ 3.6V are valid only for those platforms where it's
+                * known that the voltage range is supported by hardware.
+                */
+               case MMC_VDD_34_35:
+               case MMC_VDD_35_36:
                        pwr = SDHCI_POWER_330;
                        break;
                default: