summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorKishon Vijay Abraham I <kishon@ti.com>2015-08-27 14:43:56 +0530
committerUlf Hansson <ulf.hansson@linaro.org>2015-08-27 14:54:06 +0200
commitb49069fc0b96de5dd508ccba0a1417e524734712 (patch)
treea5023a0c96f314d8c0cf3f4d9b03f929eec23913 /drivers/mmc
parentc299dc39883ca5596905507cc945332fa4bae8bd (diff)
downloadlinux-b49069fc0b96de5dd508ccba0a1417e524734712.tar.gz
linux-b49069fc0b96de5dd508ccba0a1417e524734712.tar.bz2
linux-b49069fc0b96de5dd508ccba0a1417e524734712.zip
mmc: host: omap_hsmmc: use the ocrmask provided by the vmmc regulator
If the vmmc regulator provides a valid ocrmask, use it. By this even if the pdata has a valid ocrmask, it will be overwritten with the ocrmask of the vmmc regulator. Also remove the unnecessary compatibility check between the ocrmask in the pdata and the ocrmask from the vmmc regulator. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Tested-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/omap_hsmmc.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 3fde2f9dfb25..30f363da1987 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -359,16 +359,8 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
host->vcc = NULL;
} else {
ocr_value = mmc_regulator_get_ocrmask(host->vcc);
- if (!mmc_pdata(host)->ocr_mask) {
+ if (ocr_value > 0)
mmc_pdata(host)->ocr_mask = ocr_value;
- } else {
- if (!(mmc_pdata(host)->ocr_mask & ocr_value)) {
- dev_err(host->dev, "ocrmask %x is not supported\n",
- mmc_pdata(host)->ocr_mask);
- mmc_pdata(host)->ocr_mask = 0;
- return -EINVAL;
- }
- }
}
/* Allow an aux regulator */