diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-28 15:43:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-28 15:43:58 -0700 |
| commit | 5a69e9bce9984806029926f405b4517878e703e2 (patch) | |
| tree | 97d3a817b17a3f8a2e7d6099c6d96bcb67d1cd66 /MAINTAINERS | |
| parent | a8b5e037d8a00d396377a97f08f5fd2a410b96a1 (diff) | |
| parent | d0a43c12ee9f57ddb284272187bd18726c2c2c98 (diff) | |
Merge tag 'for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel:
"battery/charger driver changes:
- core:
- provide function stubs if CONFIG_POWER_SUPPLY=n
- reduce loglevel for probe defer info
- surface:
- new battery and charger drivers for Surface
- bq27xxx:
- add bq78z100 support
- fix current_now/power_avg for newer chips
- cw2015:
- add CHARGE_NOW support
- ab8500:
- drop pdata support
- convert most DT bindings to YAML
- lots of minor fixes and cleanups
reset drivers:
- ltc2952-poweroff:
- make trigger delay configurable from DT
- minor fixes and cleanups"
* tag 'for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (97 commits)
power: supply: cpcap-battery: fix invalid usage of list cursor
power: supply: bq256xx: add kerneldoc for structure members
power: supply: act8945a: correct kerneldoc
power: supply: max17040: remove unneeded double cast
power: supply: max17040: handle device_property_read_u8_array() failure
power: supply: max14577: remove unneeded variable initialization
power: supply: surface-charger: Make symbol 'surface_ac_pm_ops' static
power: supply: surface-battery: Make some symbols static
power: reset: restart-poweroff: Add missing MODULE_DEVICE_TABLE
power: reset: hisi-reboot: add missing MODULE_DEVICE_TABLE
power: supply: s3c_adc_battery: fix possible use-after-free in s3c_adc_bat_remove()
power: supply: generic-adc-battery: fix possible use-after-free in gab_remove()
power: supply: Add AC driver for Surface Aggregator Module
power: supply: Add battery driver for Surface Aggregator Module
power: supply: bq25980: Move props from battery node
power: supply: core: Use true and false for bool variable
power: supply: goldfish: Remove the GOLDFISH dependency
power: reset: ltc2952: make trigger delay configurable
power: supply: cpcap-charger: Simplify bool conversion
power: supply: cpcap-charger: Add usleep to cpcap charger to avoid usb plug bounce
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 30b63eaf30f5..a938f79695a5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10175,7 +10175,7 @@ F: drivers/misc/eeprom/eeprom.c LEGO MINDSTORMS EV3 R: David Lechner <david@lechnology.com> S: Maintained -F: Documentation/devicetree/bindings/power/supply/lego_ev3_battery.txt +F: Documentation/devicetree/bindings/power/supply/lego,ev3-battery.yaml F: arch/arm/boot/dts/da850-lego-ev3.dts F: drivers/power/supply/lego_ev3_battery.c @@ -12002,6 +12002,14 @@ F: drivers/scsi/smartpqi/smartpqi*.[ch] F: include/linux/cciss*.h F: include/uapi/linux/cciss*.h +MICROSOFT SURFACE BATTERY AND AC DRIVERS +M: Maximilian Luz <luzmaximilian@gmail.com> +L: linux-pm@vger.kernel.org +L: platform-driver-x86@vger.kernel.org +S: Maintained +F: drivers/power/supply/surface_battery.c +F: drivers/power/supply/surface_charger.c + MICROSOFT SURFACE DTX DRIVER M: Maximilian Luz <luzmaximilian@gmail.com> L: platform-driver-x86@vger.kernel.org @@ -15854,6 +15862,13 @@ S: Supported W: http://www.ibm.com/developerworks/linux/linux390/ F: drivers/s390/scsi/zfcp_* +S3C ADC BATTERY DRIVER +M: Krzysztof Kozlowski <krzk@kernel.org> +L: linux-samsung-soc@vger.kernel.org +S: Odd Fixes +F: drivers/power/supply/s3c_adc_battery.c +F: include/linux/s3c_adc_battery.h + S3C24XX SD/MMC Driver M: Ben Dooks <ben-linux@fluff.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |