diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-17 11:27:22 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-17 11:27:22 -0400 |
| commit | 04c2f4afd889f7ecaaa98b343c402a6d64ede790 (patch) | |
| tree | 1c0c0c20027fc430f823b82af3ebda1714803f8d /drivers | |
| parent | 81f6236c4811b2b2b3ea64a306c071f76788ac4b (diff) | |
| parent | 3ad55155b222f2a901405dea20ff7c68828ecd92 (diff) | |
Merge commit '3ad5515' into linaro-3.0
This is branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
as found in mainline commit b6844e8f64.
Conflicts:
arch/arm/boot/compressed/vmlinux.lds.in
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/mmci.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index fe140724a02..50f4f77ed20 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1063,7 +1063,15 @@ static int __devinit mmci_probe(struct amba_device *dev, } mmc->ops = &mmci_ops; - mmc->f_min = (host->mclk + 511) / 512; + /* + * The ARM and ST versions of the block have slightly different + * clock divider equations which means that the minimum divider + * differs too. + */ + if (variant->st_clkdiv) + mmc->f_min = DIV_ROUND_UP(host->mclk, 257); + else + mmc->f_min = DIV_ROUND_UP(host->mclk, 512); /* * If the platform data supplies a maximum operating * frequency, this takes precedence. Else, we fall back |