summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sh_mobile_sdhi.c
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2016-04-27 18:51:26 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2016-05-02 10:36:03 +0200
commita21553c9e0c236ae241d9f4333aafae24ae19dfc (patch)
tree793447d7e920e5605a19897aa3b8edafd10dae99 /drivers/mmc/host/sh_mobile_sdhi.c
parent83e95351d49f60d6cf37706bf94529116d03e648 (diff)
downloadlinux-a21553c9e0c236ae241d9f4333aafae24ae19dfc.tar.bz2
mmc: tmio/sdhi: distinguish between SCLKDIVEN and ILL_FUNC
This bit has a different meaning in SDHI and original TMIO. Document that and use the proper naming. Reviewed-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/sh_mobile_sdhi.c')
-rw-r--r--drivers/mmc/host/sh_mobile_sdhi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
index 3bf68b48aa6d..f8ea3d1d6de3 100644
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -244,7 +244,8 @@ static int sh_mobile_sdhi_wait_idle(struct tmio_mmc_host *host)
{
int timeout = 1000;
- while (--timeout && !(sd_ctrl_read16(host, CTL_STATUS2) & (1 << 13)))
+ while (--timeout && !(sd_ctrl_read16_and_16_as_32(host, CTL_STATUS)
+ & TMIO_STAT_SCLKDIVEN))
udelay(1);
if (!timeout) {