summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorDane Liu <danel@nvidia.com>2014-02-07 14:12:57 +0800
committerLaxman Dewangan <ldewangan@nvidia.com>2014-02-18 01:00:40 -0800
commit901fb3c6915a177e8bd9f5dfe120f8be8b774027 (patch)
tree30a2e1352ff1192436234cd35c0a07e8a7a02a5a /drivers/power
parent30307794af01f40cfb2cf24b61e1e7d8de00be8d (diff)
power: bq2477x: fix setting WATCHDOG Timer
Need to shift the value in calling regmap_update_bits() bug 1448568 Change-Id: Ib040ff80bc13fa349594699bfcdc5d6073d7da7e Reviewed-on: http://git-master/r/364762 (cherry picked from commit bda0579f427c28e7b8c6caca09d7c23f88d4a738) Signed-off-by: Dane Liu <danel@nvidia.com> Reviewed-on: http://git-master/r/367558 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/bq2477x-charger.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/bq2477x-charger.c b/drivers/power/bq2477x-charger.c
index f26f78fc7150..6c82e6ddadad 100644
--- a/drivers/power/bq2477x-charger.c
+++ b/drivers/power/bq2477x-charger.c
@@ -1,7 +1,7 @@
/*
* bq2477x-charger.c -- BQ24775 Charger driver
*
- * Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved.
*
* Author: Andy Park <andyp@nvidia.com>
* Author: Syed Rafiuddin <srafiuddin@nvidia.com>
@@ -235,7 +235,7 @@ static void bq2477x_work_thread(struct kthread_work *work)
}
ret = bq2477x_update_bits(bq2477x, BQ2477X_CHARGE_OPTION_0_MSB,
- BQ2477X_WATCHDOG_TIMER, 0x3);
+ BQ2477X_WATCHDOG_TIMER, 0x60);
if (ret < 0) {
dev_err(bq2477x->dev,
"CHARGE_OPTION write failed %d\n", ret);