diff options
| author | Rabin Vincent <rabin.vincent@stericsson.com> | 2012-01-05 16:55:56 +0530 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 10:59:27 +0200 |
| commit | 24351c10c70d690058d6d8fae42ec70400e566d7 (patch) | |
| tree | a40656ed1fb5493139c4e00de382d713d642d0c8 | |
| parent | 62c27f76b0966088351a4f4ea6e630c62105c33d (diff) | |
mfd: db5500-prcmu: increase timeouts
It is seen that sometimes under load, the set_epod() call
spuriously times out. Increase the timeout to large
(matching 8500) values, so that if they occur we know
it is for real.
Also remove the "Please check your firmware version" message.
ST-Ericsson ID: 408175
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I911e1b18f812e3ceebc49105904ef5a6759f51bf
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/44496
Reviewed-by: QATOOLS
Reviewed-by: QABUILD
Reviewed-by: Vijaya Kumar K-1 <vijay.kilari@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
| -rw-r--r-- | drivers/mfd/db5500-prcmu.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/mfd/db5500-prcmu.c b/drivers/mfd/db5500-prcmu.c index 69c2fb13cf6..feb1ad1a328 100644 --- a/drivers/mfd/db5500-prcmu.c +++ b/drivers/mfd/db5500-prcmu.c @@ -829,7 +829,7 @@ static int request_clk(u8 clock, bool enable) writel(MBOX_BIT(2), _PRCMU_BASE + PRCM_MBOX_CPU_SET); if (!wait_for_completion_timeout(&mb2_transfer.work, - msecs_to_jiffies(500))) { + msecs_to_jiffies(20000))) { pr_err("prcmu: request_clk() failed.\n"); r = -EIO; WARN(1, "Failed in request_clk"); @@ -902,9 +902,8 @@ static int request_pll(u8 pll, bool enable) writel(MBOX_BIT(2), _PRCMU_BASE + PRCM_MBOX_CPU_SET); if (!wait_for_completion_timeout(&mb2_transfer.work, - msecs_to_jiffies(500))) { - pr_err("prcmu: set_pll() failed.\n" - "prcmu: Please check your firmware version.\n"); + msecs_to_jiffies(20000))) { + pr_err("prcmu: set_pll() failed.\n"); r = -EIO; WARN(1, "Failed to set pll"); goto unlock_and_return; @@ -1108,7 +1107,7 @@ static int mailbox4_request(u8 mb4_request, u8 ack_request) writel(MBOX_BIT(4), (_PRCMU_BASE + PRCM_MBOX_CPU_SET)); if (!wait_for_completion_timeout(&mb4_transfer.work, - msecs_to_jiffies(500))) { + msecs_to_jiffies(20000))) { pr_err("prcmu: MB4 request %d failed", mb4_request); ret = -EIO; WARN(1, "prcmu: failed mb4 request"); @@ -1420,7 +1419,7 @@ int db5500_prcmu_set_arm_opp(u8 opp) writel(MBOX_BIT(1), _PRCMU_BASE + PRCM_MBOX_CPU_SET); if (!wait_for_completion_timeout(&mb1_transfer.work, - msecs_to_jiffies(500))) { + msecs_to_jiffies(20000))) { r = -EIO; WARN(1, "prcmu: failed to set arm opp"); goto unlock_and_return; @@ -1610,7 +1609,7 @@ int db5500_prcmu_set_ape_opp(u8 opp) writel(MBOX_BIT(1), (_PRCMU_BASE + PRCM_MBOX_CPU_SET)); if (!wait_for_completion_timeout(&mb1_transfer.work, - msecs_to_jiffies(500))) { + msecs_to_jiffies(20000))) { ret = -EIO; WARN(1, "prcmu: failed to set ape opp to %u", opp); goto unlock_and_return; @@ -1892,9 +1891,8 @@ int db5500_prcmu_set_epod(u16 epod, u8 epod_state) writel(MBOX_BIT(2), _PRCMU_BASE + PRCM_MBOX_CPU_SET); if (!wait_for_completion_timeout(&mb2_transfer.work, - msecs_to_jiffies(500))) { - pr_err("prcmu: set_epod() failed.\n" - "prcmu: Please check your firmware version.\n"); + msecs_to_jiffies(20000))) { + pr_err("prcmu: set_epod() failed.\n"); r = -EIO; WARN(1, "Failed to set epod"); goto unlock_and_return; |