]> git.baikalelectronics.ru Git - kernel.git/commit
mmc: omap_hsmmc: fix ocr mask usage
authorAnand Gadiyar <gadiyar@ti.com>
Tue, 14 Jun 2011 10:29:59 +0000 (15:59 +0530)
committerChris Ball <cjb@laptop.org>
Sat, 25 Jun 2011 22:50:17 +0000 (18:50 -0400)
commit2de182a2aa7ba56327c48907a9c0f973563c957c
treed7644e3be353a6bcefc3b36e6fef589b106a89a1
parent3255e90f70ce42c2d2189cdfd9f0ba32d860cc79
mmc: omap_hsmmc: fix ocr mask usage

The OMAP HSMMC driver uses an ocr_mask to determine the list of voltages
supported by the card. It populates this mask based on the list of
voltages supported by the regulator that supplies the voltage.

Commit 21f7bf988a (omap4 hsmmc: Update ocr mask for MMC2 for regulator
to use) passed a fixed ocr_mask from the OMAP4 SDP board file to limit
the voltage to 2.9-3.0 Volts, and updated the driver to use this mask
if provided, instead of using the regulator's supported voltages.

However the commit is buggy - the ocr_mask is overridden by the
regulator's capabilities anyway. Fix this.

(The bug shows up when a system-wide suspend is attempted on the OMAP4
SDP/Blaze platforms. The eMMC card comes up at 3V, but drops to 1.65V
after the system resumes).

Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Acked-by: Balaji T K <balajitk@ti.com>
Acked-by: Venkatraman S <svenkatr@ti.com>
Tested-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/omap_hsmmc.c