aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mmc/host/tmio_mmc.c5
-rw-r--r--include/linux/mfd/tmio.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index faa16b7d941..883fcac2100 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)
847 mmc->caps |= pdata->capabilities; 847 mmc->caps |= pdata->capabilities;
848 mmc->f_max = pdata->hclk; 848 mmc->f_max = pdata->hclk;
849 mmc->f_min = mmc->f_max / 512; 849 mmc->f_min = mmc->f_max / 512;
850 mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; 850 if (pdata->ocr_mask)
851 mmc->ocr_avail = pdata->ocr_mask;
852 else
853 mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
851 854
852 /* Tell the MFD core we are ready to be enabled */ 855 /* Tell the MFD core we are ready to be enabled */
853 if (cell->enable) { 856 if (cell->enable) {
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index feeed0b9ee7..f07425bc3dc 100644
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -70,6 +70,7 @@ struct tmio_mmc_data {
70 unsigned int hclk; 70 unsigned int hclk;
71 unsigned long capabilities; 71 unsigned long capabilities;
72 unsigned long flags; 72 unsigned long flags;
73 u32 ocr_mask; /* available voltages */
73 struct tmio_mmc_dma *dma; 74 struct tmio_mmc_dma *dma;
74 void (*set_pwr)(struct platform_device *host, int state); 75 void (*set_pwr)(struct platform_device *host, int state);
75 void (*set_clk_div)(struct platform_device *host, int state); 76 void (*set_clk_div)(struct platform_device *host, int state);