summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorSumit Sharma <sumsharma@nvidia.com>2013-03-01 17:21:35 +0530
committerMandar Padmawar <mpadmawar@nvidia.com>2013-03-15 07:11:05 -0700
commit5a86449a1aa4d41c387641b1c3c411dbb6b1750c (patch)
tree94690b57336fa8b05e93e1ec59f1245a931b30c8 /drivers/mfd
parent20993e0246ab5f7796b0b35bf718d5f6f2fb60a9 (diff)
mfd: bq2419x: Fix hot-plug functionality
Fix hot-plug funtionality in bq2419x mfd driver Bug 1245272 Change-Id: I8ba74f77215f8d69e494856d9599d714653d1d67 Signed-off-by: Sumit Sharma <sumsharma@nvidia.com> Reviewed-on: http://git-master/r/205551 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/bq2419x.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/mfd/bq2419x.c b/drivers/mfd/bq2419x.c
index 71c510e5332e..59b7a0c12d5f 100644
--- a/drivers/mfd/bq2419x.c
+++ b/drivers/mfd/bq2419x.c
@@ -3,7 +3,7 @@
*
* MFD driver for BQ2419X charger.
*
- * Copyright (c) 2012, NVIDIA Corporation.
+ * Copyright (c) 2012-2013, NVIDIA Corporation.
*
* Author: Laxman Dewangan <ldewangan@nvidia.com>
*
@@ -43,7 +43,6 @@ static const struct regmap_config bq2419x_regmap_config = {
.reg_bits = 8,
.val_bits = 8,
.max_register = BQ2419X_MAX_REGS,
- .cache_type = REGCACHE_RBTREE,
};
static int __devinit bq2419x_probe(struct i2c_client *client,
@@ -84,6 +83,15 @@ static int __devinit bq2419x_probe(struct i2c_client *client,
}
}
+ /* Clear EN_HIZ */
+ ret = regmap_update_bits(bq->regmap,
+ BQ2419X_INPUT_SRC_REG, BQ2419X_EN_HIZ, 0);
+ if (ret < 0) {
+ dev_err(bq->dev, "error reading reg: 0x%x\n",
+ BQ2419X_INPUT_SRC_REG);
+ return ret;
+ }
+
ret = mfd_add_devices(bq->dev, -1, bq2419x_children,
ARRAY_SIZE(bq2419x_children), NULL, 0);
if (ret < 0) {