diff options
| author | sbrissen <sbrissen@hotmail.com> | 2013-06-21 07:40:19 -0400 |
|---|---|---|
| committer | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-06-25 17:05:03 +0200 |
| commit | cb93f68cb9ab19d9647962568b4c895548a869e8 (patch) | |
| tree | 489bbfb6351db1d685e81c3d8c9c118544b68be4 /drivers/power | |
| parent | 5b3cb3ccc3df3b6106b5ae91f1ca77fcb1d99064 (diff) | |
| download | kernel_samsung_smdk4412-cb93f68cb9ab19d9647962568b4c895548a869e8.zip kernel_samsung_smdk4412-cb93f68cb9ab19d9647962568b4c895548a869e8.tar.gz kernel_samsung_smdk4412-cb93f68cb9ab19d9647962568b4c895548a869e8.tar.bz2 | |
smdk4412: add i925/p4noteltevzw support
Change-Id: I17d3befd6a6538c16db0675253927068a09085c6
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/max17042_fuelgauge_px.c | 49 | ||||
| -rw-r--r-- | drivers/power/sec_battery_px.c | 3 |
2 files changed, 51 insertions, 1 deletions
diff --git a/drivers/power/max17042_fuelgauge_px.c b/drivers/power/max17042_fuelgauge_px.c index b8f02cb..1334db0 100644 --- a/drivers/power/max17042_fuelgauge_px.c +++ b/drivers/power/max17042_fuelgauge_px.c @@ -387,6 +387,31 @@ static int fg_read_soc(void) return soc; } +static int fg_read_raw_soc(void) +{ + struct i2c_client *client = fg_i2c_client; + struct max17042_chip *chip = i2c_get_clientdata(client); + u8 data[2]; + u32 soc_lsb = 0; + int psoc = 0; + + if (fg_i2c_read(client, SOCREP_REG, data, 2) < 0) { + pr_err("%s: Failed to read SOCREP\n", __func__); + return -1; + } + + soc_lsb = (data[0] * 100) / 256; + psoc = (data[1] * 100) + soc_lsb; + chip->info.psoc = psoc; + + if (!(chip->info.pr_cnt % PRINT_COUNT)) + pr_info("%s: psoc(%d), vfsoc(%d)\n", __func__, + psoc, fg_read_vfsoc()); + + return psoc; +} + + static int fg_read_current(void) { struct i2c_client *client = fg_i2c_client; @@ -907,6 +932,27 @@ void fg_check_vf_fullcap_range(void) fg_read_register(DPACC_REG)); } +int fg_check_cap_corruption_p4(void) +{ + + struct i2c_client *client = fg_i2c_client; + struct max17042_chip *chip = i2c_get_clientdata(client); + + int designcap; + + /* If usgin Jig or low batt compensation flag is set, + then skip checking. */ + if (chip->pdata->check_jig_status()) { + fg_write_register(DESIGNCAP_REG, chip->info.vfcapacity - 1); + designcap = fg_read_register(DESIGNCAP_REG); + pr_info("%s: return by jig, vfcap(0x%04x), designcap(0x%04x)\n", + __func__, chip->info.vfcapacity, designcap); + return 0; + } else + return 1; +} + + int fg_check_cap_corruption(void) { struct i2c_client *client = fg_i2c_client; @@ -1621,6 +1667,9 @@ int get_fuelgauge_value(int data) ret = fg_read_voltage_now(); break; + case FG_RAW_LEVEL: + ret = fg_read_raw_soc(); + break; default: ret = -1; break; diff --git a/drivers/power/sec_battery_px.c b/drivers/power/sec_battery_px.c index 4787c9d..0a31772 100644 --- a/drivers/power/sec_battery_px.c +++ b/drivers/power/sec_battery_px.c @@ -1043,11 +1043,12 @@ static int sec_bat_get_charging_status(struct battery_data *battery) { switch (battery->info.charging_source) { case CHARGER_BATTERY: - case CHARGER_USB: + //case CHARGER_USB: return POWER_SUPPLY_STATUS_DISCHARGING; case CHARGER_AC: case CHARGER_MISC: case CHARGER_DOCK: + case CHARGER_USB: if (battery->info.batt_is_full) return POWER_SUPPLY_STATUS_FULL; else if (battery->info.batt_improper_ta) |