diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2013-01-15 10:30:27 -0500 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2013-02-24 14:36:56 -0500 |
commit | ef4d0888bb7e1b963880f086575081c3d39cad2d (patch) | |
tree | 9b6ce04697d823f784219c73f9991a91053e531c | |
parent | 893613b06f10578851d6bc36f0da33d248c93554 (diff) |
mmc: sdhci-esdhc-imx: fix host version read
When commit 95a2482 (mmc: sdhci-esdhc-imx: add basic imx6q usdhc
support) works around host version issue on imx6q, it gets the
register address fixup "reg ^= 2" lost for imx25/35/51/53 esdhc.
Thus, the controller version on these SoCs is wrongly identified
as v1 while it's actually v2.
Add the address fixup back and take a different approach to correct
imx6q host version, so that the host version read gets back to work
for all SoCs.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r-- | drivers/mmc/host/sdhci-esdhc-imx.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index ae68bc965ab5..ac6f971b625f 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c | |||
@@ -220,15 +220,18 @@ static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg) | |||
220 | 220 | ||
221 | static u16 esdhc_readw_le(struct sdhci_host *host, int reg) | 221 | static u16 esdhc_readw_le(struct sdhci_host *host, int reg) |
222 | { | 222 | { |
223 | struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); | ||
224 | struct pltfm_imx_data *imx_data = pltfm_host->priv; | ||
225 | |||
223 | if (unlikely(reg == SDHCI_HOST_VERSION)) { | 226 | if (unlikely(reg == SDHCI_HOST_VERSION)) { |
224 | u16 val = readw(host->ioaddr + (reg ^ 2)); | 227 | reg ^= 2; |
225 | /* | 228 | if (is_imx6q_usdhc(imx_data)) { |
226 | * uSDHC supports SDHCI v3.0, but it's encoded as value | 229 | /* |
227 | * 0x3 in host controller version register, which violates | 230 | * The usdhc register returns a wrong host version. |
228 | * SDHCI_SPEC_300 definition. Work it around here. | 231 | * Correct it here. |
229 | */ | 232 | */ |
230 | if ((val & SDHCI_SPEC_VER_MASK) == 3) | 233 | return SDHCI_SPEC_300; |
231 | return --val; | 234 | } |
232 | } | 235 | } |
233 | 236 | ||
234 | return readw(host->ioaddr + reg); | 237 | return readw(host->ioaddr + reg); |