aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorMinsu, Kim <minsu78.kim@samsung.com>2011-01-05 12:51:08 +0900
committerArve Hjønnevåg <arve@android.com>2011-11-17 17:52:49 -0800
commitf7f1d8e82c37bd8aeff0ba941c98ff6c04740c86 (patch)
treec0b1994085deb3fda7607e88f18e35d91cd66cdf /drivers/power
parentaf7788e89e783e5b928f97cb33279348c8420df5 (diff)
downloadkernel_samsung_crespo-f7f1d8e82c37bd8aeff0ba941c98ff6c04740c86.zip
kernel_samsung_crespo-f7f1d8e82c37bd8aeff0ba941c98ff6c04740c86.tar.gz
kernel_samsung_crespo-f7f1d8e82c37bd8aeff0ba941c98ff6c04740c86.tar.bz2
S5PC11X: BATTERY: don't turn on USB power of call processor
It's not necessary to turn on cp usb power. So we have to set esafeout to '2' If setting the value to '3', the consume current will be increased. Change-Id: I842339ccfbe1ceec4cb6abb91b2f0cfe4ae595f3 Signed-off-by: Minsu Kim <minsu78.kim@samsung.com>
Diffstat (limited to 'drivers/power')
-rwxr-xr-xdrivers/power/s5pc110_battery.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/power/s5pc110_battery.c b/drivers/power/s5pc110_battery.c
index 5067b9d..79aac47 100755
--- a/drivers/power/s5pc110_battery.c
+++ b/drivers/power/s5pc110_battery.c
@@ -457,11 +457,6 @@ static int max8998_charging_control(struct chg_data *chg)
if (ret < 0)
goto err;
- ret = max8998_update_reg(chg->iodev, MAX8998_REG_CHGR2,
- (2 << MAX8998_SHIFT_ESAFEOUT), MAX8998_MASK_ESAFEOUT);
- if (ret < 0)
- goto err;
-
pr_debug("%s : TA charging enabled", __func__);
} else {
@@ -476,15 +471,15 @@ static int max8998_charging_control(struct chg_data *chg)
if (ret < 0)
goto err;
- ret = max8998_update_reg(chg->iodev, MAX8998_REG_CHGR2,
- (3 << MAX8998_SHIFT_ESAFEOUT), MAX8998_MASK_ESAFEOUT);
- if (ret < 0)
- goto err;
-
pr_debug("%s : USB charging enabled", __func__);
}
ret = max8998_update_reg(chg->iodev, MAX8998_REG_CHGR2,
+ (2 << MAX8998_SHIFT_ESAFEOUT), MAX8998_MASK_ESAFEOUT);
+ if (ret < 0)
+ goto err;
+
+ ret = max8998_update_reg(chg->iodev, MAX8998_REG_CHGR2,
(0 << MAX8998_SHIFT_CHGEN), MAX8998_MASK_CHGEN);
if (ret < 0)
goto err;