diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2010-05-19 14:37:25 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-22 04:05:21 -0400 |
commit | a2b14dc9615c215a8cf4f2041f6c0c3fff5fc486 (patch) | |
tree | b4958eebca382ca616622e3abf148853e4f84f5e /drivers/mmc/host/tmio_mmc.c | |
parent | 8f4b3036d1b9bdb6f5fa0b920e0163d64a990327 (diff) |
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>
Diffstat (limited to 'drivers/mmc/host/tmio_mmc.c')
-rw-r--r-- | drivers/mmc/host/tmio_mmc.c | 5 |
1 files changed, 4 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) | |||
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) { |