diff options
author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
---|---|---|
committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/power/max17042_fuelgauge_u1.c | |
parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/power/max17042_fuelgauge_u1.c')
-rw-r--r-- | drivers/power/max17042_fuelgauge_u1.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/power/max17042_fuelgauge_u1.c b/drivers/power/max17042_fuelgauge_u1.c index 1434c72063a..39b931c9da1 100644 --- a/drivers/power/max17042_fuelgauge_u1.c +++ b/drivers/power/max17042_fuelgauge_u1.c @@ -337,9 +337,10 @@ static void max17042_get_soc(struct i2c_client *client) if (chip->is_enable) { if (max17042_read_reg(client, MAX17042_REG_SOC_VF, data) < 0) return; +#ifndef PRODUCT_SHIP dev_info(&chip->client->dev, "%s : soc(%02x%02x)\n", __func__, data[1], data[0]); - +#endif soc = (data[1] * 100) + (data[0] * 100 / 256); chip->raw_soc = min(soc / 100, 100); @@ -398,7 +399,7 @@ static void max17042_get_soc(struct i2c_client *client) /*raw 1.6% ~ 97.6% */ soc = (soc > 100) ? ((soc - 60) * 100 / 9700) : 0; /*raw 1.5% ~ 95% */ - /*soc = (soc < 150) ? 0 : ((soc - 150) * 100 / 9350) + 1; */ + /*soc = (soc < 150) ? 0 : ((soc - 150) * 100 / 9350) + 1; */ } #else /* adjusted soc by adding 0.45 */ @@ -412,8 +413,10 @@ static void max17042_get_soc(struct i2c_client *client) chip->soc = soc; +#ifndef PRODUCT_SHIP dev_info(&client->dev, "%s : use raw (%d), soc (%d)\n", __func__, chip->raw_soc, soc); +#endif } static void max17042_get_temperature(struct i2c_client *client) @@ -423,7 +426,8 @@ static void max17042_get_temperature(struct i2c_client *client) s32 temper = 0; if (chip->is_enable) { - if (max17042_read_reg(client, MAX17042_REG_TEMPERATURE, data) < 0) + if (max17042_read_reg(client, + MAX17042_REG_TEMPERATURE, data) < 0) return; /* data[] store 2's compliment format number */ @@ -513,7 +517,7 @@ static void max17042_work(struct work_struct *work) dev_info(&chip->client->dev, "fuel alert already activated (raw:%d)\n", chip->raw_soc); - } else if (chip->raw_soc == chip->fuel_alert_soc) { + } else if (chip->raw_soc >= chip->fuel_alert_soc) { if (chip->is_fuel_alerted) { wake_unlock(&chip->fuel_alert_wake_lock); chip->is_fuel_alerted = false; @@ -629,7 +633,8 @@ static ssize_t sec_fg_store(struct device *dev, union power_supply_propval value; if (!psy) { - pr_err("%s: fail to get battery ps\n", __func__); + pr_err("%s: fail to get battery ps\n", + __func__); return -ENODEV; } |