diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-09-25 18:23:41 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-09-27 02:50:40 +0200 |
| commit | c056bd0db163b341cc4a714013a1c27145944999 (patch) | |
| tree | cd2be174f06b716b5c26dc2701ba0a61381d01b1 | |
| parent | b756ec1b2239042a6e26e47d8cde77f41c4ae776 (diff) | |
| download | kernel_i9300_mainline-c056bd0db163b341cc4a714013a1c27145944999.zip kernel_i9300_mainline-c056bd0db163b341cc4a714013a1c27145944999.tar.gz kernel_i9300_mainline-c056bd0db163b341cc4a714013a1c27145944999.tar.bz2 | |
Revert "ANDROID: power: max17042_battery: report SOC and battery type"
This reverts commit da6056017a0e948f4a81aa0ef192dc264c10ebc2.
| -rw-r--r-- | drivers/power/max17042_battery.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c index 135cec1..da7a75f 100644 --- a/drivers/power/max17042_battery.c +++ b/drivers/power/max17042_battery.c @@ -94,7 +94,6 @@ static enum power_supply_property max17042_battery_props[] = { POWER_SUPPLY_PROP_HEALTH, POWER_SUPPLY_PROP_CURRENT_NOW, POWER_SUPPLY_PROP_CURRENT_AVG, - POWER_SUPPLY_PROP_TECHNOLOGY, }; static int max17042_get_temperature(struct max17042_chip *chip, int *temp) @@ -247,7 +246,7 @@ static int max17042_get_property(struct power_supply *psy, val->intval = data * 625 / 8; break; case POWER_SUPPLY_PROP_CAPACITY: - ret = regmap_read(map, MAX17042_VFSOC, &data); + ret = regmap_read(map, MAX17042_RepSOC, &data); if (ret < 0) return ret; @@ -333,9 +332,6 @@ static int max17042_get_property(struct power_supply *psy, return -EINVAL; } break; - case POWER_SUPPLY_PROP_TECHNOLOGY: - val->intval = POWER_SUPPLY_TECHNOLOGY_LION; - break; default: return -EINVAL; } @@ -396,7 +392,6 @@ static int max17042_property_is_writeable(struct power_supply *psy, switch (psp) { case POWER_SUPPLY_PROP_TEMP_ALERT_MIN: case POWER_SUPPLY_PROP_TEMP_ALERT_MAX: - case POWER_SUPPLY_PROP_TECHNOLOGY: ret = 1; break; default: |