summaryrefslogtreecommitdiffstats
path: root/drivers/soc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-19 10:52:43 +0200
committerArnd Bergmann <arnd@arndb.de>2016-09-19 10:52:43 +0200
commit70e058835562902a31ebac3e7bc70accd779c9c3 (patch)
treec1d1a86934904e3babf9200bf6c29bfb1b9eb5d9 /drivers/soc
parentbdfb3af1b3a22bf2eaf98f0965ce797f0ae8b5ce (diff)
parente180f887ba40a916153e29e6ad48c34d28966740 (diff)
downloadlinux-70e058835562902a31ebac3e7bc70accd779c9c3.tar.bz2
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.
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/mediatek/mtk-pmic-wrap.c2
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,
{
unsigned long timeout;
- timeout = jiffies + usecs_to_jiffies(255);
+ timeout = jiffies + usecs_to_jiffies(10000);
do {
if (time_after(jiffies, timeout))