summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorXin Xie <xxie@nvidia.com>2012-08-02 18:28:48 -0700
committerSimone Willett <swillett@nvidia.com>2012-08-03 14:01:44 -0700
commit86f83b9106ac19f861863d2a072a3206cdd99a42 (patch)
tree8c2278ecea34cd71c459db9e32756e87f31308d1 /drivers
parentc05cdfa7545c1aff454734a9b99d52b7e5e66292 (diff)
mfd: tps80031: fix wrong regmap for charger
BUG 1026050 Change-Id: Ide19fd183ee172c84b0d5d2d0382e8ec944f2a87 Signed-off-by: Xin Xie <xxie@nvidia.com> Reviewed-on: http://git-master/r/120580 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/tps80031.c2
-rw-r--r--drivers/power/tps80031-charger.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mfd/tps80031.c b/drivers/mfd/tps80031.c
index e8a00a846046..f524b2964068 100644
--- a/drivers/mfd/tps80031.c
+++ b/drivers/mfd/tps80031.c
@@ -132,7 +132,7 @@
#define TPS80031_ID2_PWM 0xBA ... 0xBE
#define TPS80031_ID2_FUEL_GAUSE 0xC0 ... 0xCB
#define TPS80031_ID2_INTERFACE_INTERRUPTS 0xD0 ... 0xD8
-#define TPS80031_ID2_CHARGER 0xE0 ... 0xF5
+#define TPS80031_ID2_CHARGER 0xDA ... 0xF5
#define TPS80031_ID3_TEST_LDO 0x00 ... 0x09
#define TPS80031_ID3_TEST_SMPS 0x10 ... 0x2B
diff --git a/drivers/power/tps80031-charger.c b/drivers/power/tps80031-charger.c
index 123c4a32025a..70a365797089 100644
--- a/drivers/power/tps80031-charger.c
+++ b/drivers/power/tps80031-charger.c
@@ -269,7 +269,8 @@ static int configure_charging_parameter(struct tps80031_charger *charger)
}
/* set Pre Charge current to 400mA */
- ret = tps80031_write(charger->dev->parent, SLAVE_ID2, 0xDE, 0x3);
+ ret = tps80031_write(charger->dev->parent, SLAVE_ID2,
+ CHARGERUSB_VICHRG_PC, 0x3);
if (ret < 0) {
dev_err(charger->dev, "%s(): Failed in writing register 0x%02x\n",
__func__, 0xDD);