summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Suchanek <hramrach@gmail.com>2015-08-12 15:29:31 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2015-08-27 14:50:53 +0200
commit7bb9c244356d2d45ac03cf65e55b035c5954d7de (patch)
tree5dabf7f02714c09e329a3b16ac5cfdc250779e64
parent1880d8f6fbb01a16404dee7167621dc09b5f1d35 (diff)
downloadop-kernel-dev-7bb9c244356d2d45ac03cf65e55b035c5954d7de.zip
op-kernel-dev-7bb9c244356d2d45ac03cf65e55b035c5954d7de.tar.gz
mmc: sunxi: fix timeout in sunxi_mmc_oclk_onoff
The 250ms timeout is too short. On my system enabling the oclk takes under 50ms and disabling slightly over 100ms when idle. Under load disabling the clock can take over 350ms. This does not make mmc clock gating look like good option to have on sunxi but the system should not crash with mmc clock gating enabled nonetheless. This patch sets the timeout to 750ms. Signed-off-by: Michal Suchanek <hramrach@gmail.com> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/host/sunxi-mmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
index 4d3e1ff..a7b7a67 100644
--- a/drivers/mmc/host/sunxi-mmc.c
+++ b/drivers/mmc/host/sunxi-mmc.c
@@ -595,7 +595,7 @@ static irqreturn_t sunxi_mmc_handle_manual_stop(int irq, void *dev_id)
static int sunxi_mmc_oclk_onoff(struct sunxi_mmc_host *host, u32 oclk_en)
{
- unsigned long expire = jiffies + msecs_to_jiffies(250);
+ unsigned long expire = jiffies + msecs_to_jiffies(750);
u32 rval;
rval = mmc_readl(host, REG_CLKCR);
OpenPOWER on IntegriCloud