summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2012-03-28 18:01:10 +0900
committerChris Ball <cjb@laptop.org>2012-04-05 20:32:24 -0400
commit930f152cc9998388031af577843baae572ac8ab6 (patch)
tree216a0a14ff0758a906abbf3d51df616d9330fbc7 /drivers
parentf93882570496aa02ba8a47bfaf81cce43046b978 (diff)
downloadlinux-stable-930f152cc9998388031af577843baae572ac8ab6.tar.gz
linux-stable-930f152cc9998388031af577843baae572ac8ab6.tar.bz2
linux-stable-930f152cc9998388031af577843baae572ac8ab6.zip
mmc: sh_mmcif: mmc->f_max should be half of the bus clock
mmc->f_max should be half of the bus clock. And now that mmc->f_max is not equal to the bus clock the latter should be used directly to calculate mmc->f_min. Cc: Magnus Damm <magnus.damm@gmail.com> Tested-by: Cao Minh Hiep <hiepcm@gmail.com> Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/sh_mmcif.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index d79c6430c164..4bb999ed335d 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -1298,14 +1298,14 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
spin_lock_init(&host->lock);
mmc->ops = &sh_mmcif_ops;
- mmc->f_max = host->clk;
+ mmc->f_max = host->clk / 2;
/* close to 400KHz */
- if (mmc->f_max < 51200000)
- mmc->f_min = mmc->f_max / 128;
- else if (mmc->f_max < 102400000)
- mmc->f_min = mmc->f_max / 256;
+ if (host->clk < 51200000)
+ mmc->f_min = host->clk / 128;
+ else if (host->clk < 102400000)
+ mmc->f_min = host->clk / 256;
else
- mmc->f_min = mmc->f_max / 512;
+ mmc->f_min = host->clk / 512;
if (pd->ocr)
mmc->ocr_avail = pd->ocr;
mmc->caps = MMC_CAP_MMC_HIGHSPEED;