summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorKim, Milo <Milo.Kim@ti.com>2012-08-31 09:25:07 +0000
committerAnton Vorontsov <anton.vorontsov@linaro.org>2012-09-20 18:03:45 -0700
commit18763a36d0bae11a916ffe8fa58a26fd0b5eb115 (patch)
treebf001258595c34c2c02bf69553a83fda49819083 /drivers/power
parent6029719f08d2d21624504e326f50c68f89731353 (diff)
downloadop-kernel-dev-18763a36d0bae11a916ffe8fa58a26fd0b5eb115.zip
op-kernel-dev-18763a36d0bae11a916ffe8fa58a26fd0b5eb115.tar.gz
lp8727_charger: Use specific definition
Add new LP8727_ICHG_SHIFT definition and replace a magic number. Reuse definition for the size of interrupt register buffer. Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com> Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/lp8727_charger.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c
index 65c9840..254bbe0 100644
--- a/drivers/power/lp8727_charger.c
+++ b/drivers/power/lp8727_charger.c
@@ -59,6 +59,9 @@
#define LP8727_TEMP_STAT (3 << 5)
#define LP8727_TEMP_SHIFT 5
+/* CHGCTRL2 register */
+#define LP8727_ICHG_SHIFT 4
+
enum lp8727_dev_id {
LP8727_ID_NONE,
LP8727_ID_TA,
@@ -222,11 +225,11 @@ static void lp8727_enable_chgdet(struct lp8727_chg *pchg)
static void lp8727_delayed_func(struct work_struct *_work)
{
- u8 intstat[2], idno, vbus;
+ u8 intstat[LP8788_NUM_INTREGS], idno, vbus;
struct lp8727_chg *pchg =
container_of(_work, struct lp8727_chg, work.work);
- if (lp8727_read_bytes(pchg, LP8727_INT1, intstat, 2)) {
+ if (lp8727_read_bytes(pchg, LP8727_INT1, intstat, LP8788_NUM_INTREGS)) {
dev_err(pchg->dev, "can not read INT registers\n");
return;
}
@@ -401,7 +404,7 @@ static void lp8727_charger_changed(struct power_supply *psy)
if (pchg->chg_parm) {
eoc_level = pchg->chg_parm->eoc_level;
ichg = pchg->chg_parm->ichg;
- val = (ichg << 4) | eoc_level;
+ val = (ichg << LP8727_ICHG_SHIFT) | eoc_level;
lp8727_write_byte(pchg, LP8727_CHGCTRL2, val);
}
}
OpenPOWER on IntegriCloud