diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-27 16:03:21 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-27 16:03:21 +0100 |
| commit | 99258c34103efad3395c679256a221731d010c4b (patch) | |
| tree | 19ad64086e1551cd8f94eb9cdca0eb1335def970 /drivers/mmc/mv_sdhci.c | |
| parent | 1de55ef105f9e00ea313c91679fed6560c63f447 (diff) | |
| parent | afd5932b2c27c750ba7dbe39125916a45d2e1c13 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
* 'master' of git://git.denx.de/u-boot-mmc:
Revert "mmc: retry the cmd8 to meet 74 clocks requirement in the spec"
mmc: mv_sdhci: Fix host version read for Armada100
Diffstat (limited to 'drivers/mmc/mv_sdhci.c')
| -rw-r--r-- | drivers/mmc/mv_sdhci.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c index f92caeb8fd..1501974e2f 100644 --- a/drivers/mmc/mv_sdhci.c +++ b/drivers/mmc/mv_sdhci.c @@ -48,7 +48,10 @@ int mv_sdh_init(u32 regbase, u32 max_clk, u32 min_clk, u32 quirks) mv_ops.write_b = mv_sdhci_writeb; host->ops = &mv_ops; #endif - host->version = sdhci_readw(host, SDHCI_HOST_VERSION); + if (quirks & SDHCI_QUIRK_REG32_RW) + host->version = sdhci_readl(host, SDHCI_HOST_VERSION - 2) >> 16; + else + host->version = sdhci_readw(host, SDHCI_HOST_VERSION); add_sdhci(host, max_clk, min_clk); return 0; } |