tifm_sd: fix hardware timeout setup

The register access order when setting hardware timeout was incorrect and
causing problems (wrong timeout intervals). This is now fixed.

Signed-off-by: Alex Dubov <oakad@yahoo.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/mmc/tifm_sd.c b/drivers/mmc/tifm_sd.c
index 69b78eb16eff..5817a138a1e4 100644
--- a/drivers/mmc/tifm_sd.c
+++ b/drivers/mmc/tifm_sd.c
@@ -442,22 +442,21 @@ static void tifm_sd_set_data_timeout(struct tifm_sd *host,
                 return;
 
         data_timeout += data->timeout_ns /
-                        ((1000000000 / host->clk_freq) * host->clk_div);
-        data_timeout *= 10; // call it fudge factor for now
+                        ((1000000000UL / host->clk_freq) * host->clk_div);
 
         if (data_timeout < 0xffff) {
-                writel((~TIFM_MMCSD_DPE) &
-                                readl(sock->addr + SOCK_MMCSD_SDIO_MODE_CONFIG),
-                       sock->addr + SOCK_MMCSD_SDIO_MODE_CONFIG);
                 writel(data_timeout, sock->addr + SOCK_MMCSD_DATA_TO);
+                writel((~TIFM_MMCSD_DPE)
+                       & readl(sock->addr + SOCK_MMCSD_SDIO_MODE_CONFIG),
+                       sock->addr + SOCK_MMCSD_SDIO_MODE_CONFIG);
         } else {
-                writel(TIFM_MMCSD_DPE |
-                                readl(sock->addr + SOCK_MMCSD_SDIO_MODE_CONFIG),
-                        sock->addr + SOCK_MMCSD_SDIO_MODE_CONFIG);
                 data_timeout = (data_timeout >> 10) + 1;
                 if(data_timeout > 0xffff)
                         data_timeout = 0;       /* set to unlimited */
                 writel(data_timeout, sock->addr + SOCK_MMCSD_DATA_TO);
+                writel(TIFM_MMCSD_DPE
+                       | readl(sock->addr + SOCK_MMCSD_SDIO_MODE_CONFIG),
+                       sock->addr + SOCK_MMCSD_SDIO_MODE_CONFIG);
         }
 }