diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 04:52:43 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 04:52:43 -0400 |
| commit | 70e058835562902a31ebac3e7bc70accd779c9c3 (patch) | |
| tree | c1d1a86934904e3babf9200bf6c29bfb1b9eb5d9 | |
| parent | bdfb3af1b3a22bf2eaf98f0965ce797f0ae8b5ce (diff) | |
| parent | e180f887ba40a916153e29e6ad48c34d28966740 (diff) | |
Merge tag 'v4.8-next-soc' of https://github.com/mbgg/linux-mediatek into next/drivers
Pull "ARM: mediatek: soc updates for v4.9" from Matthias Brugger:
extent the waiting time of the pmic wrapper to 10 ms which
reduces the failure rate on the data transfer between pmic and
pmic wrapper.
* tag 'v4.8-next-soc' of https://github.com/mbgg/linux-mediatek:
soc: mediatek: PMIC wrap: Extend the waiting time to 10ms.
| -rw-r--r-- | drivers/soc/mediatek/mtk-pmic-wrap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c index a003ba26ca6e..a5f10936fb9c 100644 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c | |||
| @@ -583,7 +583,7 @@ static int pwrap_wait_for_state(struct pmic_wrapper *wrp, | |||
| 583 | { | 583 | { |
| 584 | unsigned long timeout; | 584 | unsigned long timeout; |
| 585 | 585 | ||
| 586 | timeout = jiffies + usecs_to_jiffies(255); | 586 | timeout = jiffies + usecs_to_jiffies(10000); |
| 587 | 587 | ||
| 588 | do { | 588 | do { |
| 589 | if (time_after(jiffies, timeout)) | 589 | if (time_after(jiffies, timeout)) |