Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bq27xxx sysfs names #8

Merged
merged 2 commits into from
Jan 31, 2017
Merged

bq27xxx sysfs names #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0b239b
power: supply: bq27xxx_battery: use sysfs property names
networkimprov Jan 31, 2017
f1b85c7
devicetree: power: rev battery characteristics & commit comment
networkimprov Jan 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions Documentation/devicetree/bindings/power/supply/battery.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ Required Properties:
- compatible: Must be "fixed-battery"

Optional Properties:
- terminal-microvolt: dead battery voltage
- design-microwatt-hours: battery design energy
- design-microamp-hours: battery design capacity
- voltage-min-design-microvolt: drained battery voltage
- voltage-max-design-microvolt: charged battery voltage
- energy-full-design-microwatt-hours: battery design energy
- charge-full-design-microamp-hours: battery design capacity

Batteries must be referenced by chargers and/or fuel-gauges
using a phandle. The phandle's property should be named
Expand All @@ -16,9 +17,10 @@ Example:

bat: battery {
compatible = "fixed-battery";
terminal-microvolt = <3700000>;
design-microwatt-hours = <5290000>;
design-microamp-hours = <1430000>;
voltage-min-design-microvolt = <3200000>;
voltage-max-design-microvolt = <4200000>;
energy-full-design-microwatt-hours = <5290000>;
charge-full-design-microamp-hours = <1430000>;
};

charger: charger@0 {
Expand Down
46 changes: 23 additions & 23 deletions drivers/power/supply/bq27xxx_battery.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,17 +681,17 @@ static int bq27xxx_battery_set_config(struct bq27xxx_device_info *di,
if (ret < 0)
return ret;

if (info->design_current_uah != -EINVAL
&& info->design_energy_uwh != -EINVAL) {
if (info->charge_full_design_uah != -EINVAL
&& info->energy_full_design_uwh != -EINVAL) {
ret |= bq27xxx_battery_update_dm_setting(di, BQ27XXX_DM_DESIGN_CAP,
info->design_current_uah / 1000);
info->charge_full_design_uah / 1000);
ret |= bq27xxx_battery_update_dm_setting(di, BQ27XXX_DM_DESIGN_ENERGY,
info->design_energy_uwh / 1000);
info->energy_full_design_uwh / 1000);
}

if (info->terminal_voltage_uv != -EINVAL)
if (info->voltage_min_design_uv != -EINVAL)
ret |= bq27xxx_battery_update_dm_setting(di, BQ27XXX_DM_TERMINATE_VOLTAGE,
info->terminal_voltage_uv / 1000);
info->voltage_min_design_uv / 1000);

if (ret) {
dev_info(di->dev, "updating NVM settings\n");
Expand Down Expand Up @@ -974,38 +974,38 @@ void bq27xxx_battery_settings(struct bq27xxx_device_info *di)
if (power_supply_get_battery_info(di->bat, &info) < 0)
goto out;

if (info.design_energy_uwh != info.design_current_uah) {
if (info.design_energy_uwh == -EINVAL)
if (info.energy_full_design_uwh != info.charge_full_design_uah) {
if (info.energy_full_design_uwh == -EINVAL)
dev_warn(di->dev,
"missing battery:design-microwatt-hours\n");
else if (info.design_current_uah == -EINVAL)
else if (info.charge_full_design_uah == -EINVAL)
dev_warn(di->dev,
"missing battery:design-microamp-hours\n");
}

if (info.design_energy_uwh > 0x7fff * 1000) {
if (info.energy_full_design_uwh > 0x7fff * 1000) {
dev_err(di->dev, "invalid battery:design-microwatt-hours %d\n",
info.design_energy_uwh);
info.design_energy_uwh = -EINVAL;
info.energy_full_design_uwh);
info.energy_full_design_uwh = -EINVAL;
}

if (info.design_current_uah > 0x7fff * 1000) {
if (info.charge_full_design_uah > 0x7fff * 1000) {
dev_err(di->dev, "invalid battery:design-microamp-hours %d\n",
info.design_current_uah);
info.design_current_uah = -EINVAL;
info.charge_full_design_uah);
info.charge_full_design_uah = -EINVAL;
}

if ((info.terminal_voltage_uv < BQ27XXX_TERM_V_MIN * 1000
|| info.terminal_voltage_uv > BQ27XXX_TERM_V_MAX * 1000)
&& info.terminal_voltage_uv != -EINVAL) {
if ((info.voltage_min_design_uv < BQ27XXX_TERM_V_MIN * 1000
|| info.voltage_min_design_uv > BQ27XXX_TERM_V_MAX * 1000)
&& info.voltage_min_design_uv != -EINVAL) {
dev_err(di->dev, "invalid battery:terminal-microvolt %d\n",
info.terminal_voltage_uv);
info.terminal_voltage_uv = -EINVAL;
info.voltage_min_design_uv);
info.voltage_min_design_uv = -EINVAL;
}

if ((info.design_energy_uwh == -EINVAL
|| info.design_current_uah == -EINVAL)
&& info.terminal_voltage_uv == -EINVAL)
if ((info.energy_full_design_uwh == -EINVAL
|| info.charge_full_design_uah == -EINVAL)
&& info.voltage_min_design_uv == -EINVAL)
goto out;

bq27xxx_battery_set_config(di, &info);
Expand Down