mmc: let MFD's provide supported Vdd card voltages to tmio_mmc

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Ian Molton <ian@mnementh.co.uk>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

2 files changed, 5 insertions, 1 deletions

diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index faa16b7d9412..883fcac21004 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -847,7 +847,10 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
         mmc->caps |= pdata->capabilities;
         mmc->f_max = pdata->hclk;
         mmc->f_min = mmc->f_max / 512;
-        mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
+        if (pdata->ocr_mask)
+                mmc->ocr_avail = pdata->ocr_mask;
+        else
+                mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
 
         /* Tell the MFD core we are ready to be enabled */
         if (cell->enable) {
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index feeed0b9ee70..f07425bc3dcd 100644
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -70,6 +70,7 @@ struct tmio_mmc_data {
         unsigned int                    hclk;
         unsigned long                   capabilities;
         unsigned long                   flags;
+        u32                             ocr_mask;       /* available voltages */
         struct tmio_mmc_dma             *dma;
         void (*set_pwr)(struct platform_device *host, int state);
         void (*set_clk_div)(struct platform_device *host, int state);