diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-04 13:53:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-04 13:53:59 -0700 |
| commit | 72e65f7e525fe1ed399c0c5f4adda562602d025a (patch) | |
| tree | 3230ff0777287c139c346106bbc4fa959a7a187a /include/linux | |
| parent | c1e2e0350ce37f633b5ce3ce1cdf4428513fc2a2 (diff) | |
| parent | 22ad4f99f63fc892412cde5a45d43b2288a60b88 (diff) | |
Merge tag 'for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel:
"Miscellaneous small fixes and improvements all over the place.
Nothing stands out in particular"
* tag 'for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (30 commits)
power: supply: bq25890: Fix initial setting of the F_CONV_RATE field
power: supply: bq25890: Fix race causing oops at boot
power: supply: bq27xxx: Fix kernel crash on IRQ handler register error
power: bq25890: add return values to error messages
power: supply: axp288-charger: Simplify axp288_get_charger_health()
power: supply: axp288-charger: Remove unnecessary is_present and is_online helpers
power: supply: axp288-charger: Add depends on IOSF_MBIO to Kconfig
power: supply: ab8500_bmdata: Use standard phandle
dt-bindings: power: supply: ab8500: Standard monitored-battery
power: supply: axp288_charger: Fix missing mutex_init()
power: supply: max17042_battery: Prevent int underflow in set_soc_threshold
power: supply: max17042_battery: Clear status bits in interrupt handler
MAINTAINERS: power: supply: max17040: add entry with reviewers
MAINTAINERS: power: supply: max17042: add entry with reviewers
power: supply: max17040: fix null-ptr-deref in max17040_probe()
power: supply: rt5033_battery: Change voltage values to µV
power: supply: axp288-charger: Optimize register reading method
dt-bindings: power: Bindings for Samsung batteries
power: supply: cpcap-battery: use device_get_match_data() to simplify code
power: supply: max17042_battery: fix typo in MAX17042_IAvg_empty
...
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/power/max17042_battery.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/power/max17042_battery.h b/include/linux/power/max17042_battery.h index dd24756a8af7..c417abd2ab70 100644 --- a/include/linux/power/max17042_battery.h +++ b/include/linux/power/max17042_battery.h @@ -78,7 +78,7 @@ enum max17042_register { MAX17042_T_empty = 0x34, MAX17042_FullCAP0 = 0x35, - MAX17042_LAvg_empty = 0x36, + MAX17042_IAvg_empty = 0x36, MAX17042_FCTC = 0x37, MAX17042_RCOMP0 = 0x38, MAX17042_TempCo = 0x39, @@ -221,7 +221,7 @@ struct max17042_config_data { u16 fullcap; /* 0x10 */ u16 fullcapnom; /* 0x23 */ u16 socempty; /* 0x33 */ - u16 lavg_empty; /* 0x36 */ + u16 iavg_empty; /* 0x36 */ u16 dqacc; /* 0x45 */ u16 dpacc; /* 0x46 */ u16 qrtbl00; /* 0x12 */ |