From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Nov 2021 20:53:59 +0000 (-0700)
Subject: Merge tag 'for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux... 
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/72e65f7e525fe1ed399c0c5f4adda562602d025a

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
  ...
---

72e65f7e525fe1ed399c0c5f4adda562602d025a
diff --cc MAINTAINERS
index 4eb537e015d1,a6d670c58f3e..886639f1fa0b
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11508,8 -11366,29 +11508,29 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml
  F:	drivers/iio/proximity/mb1232.c
  
+ MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS
+ R:	Iskren Chernev <iskren.chernev@gmail.com>
+ R:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+ R:	Marek Szyprowski <m.szyprowski@samsung.com>
+ R:	Matheus Castello <matheus@castello.eng.br>
+ L:	linux-pm@vger.kernel.org
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml
+ F:	drivers/power/supply/max17040_battery.c
+ 
+ MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS
+ R:	Hans de Goede <hdegoede@redhat.com>
+ R:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+ R:	Marek Szyprowski <m.szyprowski@samsung.com>
+ R:	Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
+ R:	Purism Kernel Team <kernel@puri.sm>
+ L:	linux-pm@vger.kernel.org
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml
+ F:	drivers/power/supply/max17042_battery.c
+ 
  MAXIM MAX77650 PMIC MFD DRIVER
 -M:	Bartosz Golaszewski <bgolaszewski@baylibre.com>
 +M:	Bartosz Golaszewski <brgl@bgdev.pl>
  L:	linux-kernel@vger.kernel.org
  S:	Maintained
  F:	Documentation/devicetree/bindings/*/*max77650.yaml