diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-06 18:21:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-06 18:21:15 -0700 |
| commit | 021723e6c5a5e7b50eb68f9812418406de9860b2 (patch) | |
| tree | fe22465563a9056925f0e4edd236d9a6c456e6cc | |
| parent | c6594fc6af1924b7fdce600088b10e3b3b159fb7 (diff) | |
| parent | 1d72706f0485b58e151b5a7584c4c65d66670587 (diff) | |
Merge tag 'for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel:
- move power supply drivers to drivers/power/supply
- unify location of power supply DT documentation
- tps65217-charger: IRQ support
- act8945a-charger: misc. cleanups & improvements
- sbs-battery cleanup
- fix users of deprecated create_singlethread_workqueue()
- misc fixes.
* tag 'for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (46 commits)
power: supply: bq27xxx_battery: allow kernel poll_interval parameter runtime update
power: supply: sbs-battery: Cleanup removal of chip->pdata
power: reset: st: Remove obsolete platforms from dt doc
power: reset: st-poweroff: Remove obsolete platforms.
power: reset: zx-reboot: Unmap region obtained by of_iomap
power: reset: xgene-reboot: Unmap region obtained by of_iomap
power: supply: ab8500: cleanup with list_first_entry_or_null()
power: reset: add in missing white space in error message text
sbs-battery: make writes to ManufacturerAccess optional
power: bq24257: Fix use of uninitialized pointer bq->charger
power: supply: sbs-battery: simplify DT parsing
power: supply: bq24735-charger: Request status GPIO with initial input setup
power: supply: sbs-battery: Use gpio_desc and sleeping calls for battery detect
power: supply: act8945a_charger: Add max current property
power: supply: act8945a_charger: Add capacity level property
doc: bindings: power: act8945a-charger: Update properties.
power: supply: act8945a_charger: Fix the power supply type
power: supply: act8945a_charger: Add status change update support
power: supply: act8945a_charger: Improve state handling
power: supply: act8945a_charger: Remove "battery_temperature"
...
| -rw-r--r-- | CREDITS | 4 | ||||
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-power | 8 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/act8945a-charger.txt | 35 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/reset/axxia-reset.txt (renamed from Documentation/devicetree/bindings/power_supply/axxia-reset.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/reset/imx-snvs-poweroff.txt (renamed from Documentation/devicetree/bindings/power_supply/imx-snvs-poweroff.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/reset/msm-poweroff.txt (renamed from Documentation/devicetree/bindings/power_supply/msm-poweroff.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/reset/qnap-poweroff.txt (renamed from Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/reset/restart-poweroff.txt (renamed from Documentation/devicetree/bindings/power_supply/restart-poweroff.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/reset/st-reset.txt | 7 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/ab8500/btemp.txt (renamed from Documentation/devicetree/bindings/power_supply/ab8500/btemp.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/ab8500/chargalg.txt (renamed from Documentation/devicetree/bindings/power_supply/ab8500/chargalg.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/ab8500/charger.txt (renamed from Documentation/devicetree/bindings/power_supply/ab8500/charger.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/ab8500/fg.txt (renamed from Documentation/devicetree/bindings/power_supply/ab8500/fg.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/act8945a-charger.txt | 48 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt (renamed from Documentation/devicetree/bindings/power_supply/axp20x_usb_power.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/bq2415x.txt (renamed from Documentation/devicetree/bindings/power/bq2415x.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/bq24257.txt (renamed from Documentation/devicetree/bindings/power/bq24257.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/bq25890.txt (renamed from Documentation/devicetree/bindings/power/bq25890.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/charger-manager.txt (renamed from Documentation/devicetree/bindings/power_supply/charger-manager.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/da9150-charger.txt (renamed from Documentation/devicetree/bindings/power/da9150-charger.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/da9150-fg.txt (renamed from Documentation/devicetree/bindings/power/da9150-fg.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/gpio-charger.txt (renamed from Documentation/devicetree/bindings/power_supply/gpio-charger.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/isp1704.txt (renamed from Documentation/devicetree/bindings/power/isp1704.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/lp8727_charger.txt (renamed from Documentation/devicetree/bindings/power_supply/lp8727_charger.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/ltc2941.txt (renamed from Documentation/devicetree/bindings/power/ltc2941.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/max17042_battery.txt (renamed from Documentation/devicetree/bindings/power_supply/max17042_battery.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/max8925_batter.txt (renamed from Documentation/devicetree/bindings/power_supply/max8925_batter.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/olpc_battery.txt (renamed from Documentation/devicetree/bindings/power_supply/olpc_battery.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/power_supply.txt (renamed from Documentation/devicetree/bindings/power_supply/power_supply.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/qcom,coincell-charger.txt (renamed from Documentation/devicetree/bindings/power/qcom,coincell-charger.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/qcom_smbb.txt (renamed from Documentation/devicetree/bindings/power_supply/qcom_smbb.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/rt9455_charger.txt (renamed from Documentation/devicetree/bindings/power/rt9455_charger.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/rx51-battery.txt (renamed from Documentation/devicetree/bindings/power/rx51-battery.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/sbs_sbs-battery.txt (renamed from Documentation/devicetree/bindings/power_supply/sbs_sbs-battery.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/ti,bq24735.txt (renamed from Documentation/devicetree/bindings/power_supply/ti,bq24735.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/tps65090.txt (renamed from Documentation/devicetree/bindings/power_supply/tps65090.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/tps65217_charger.txt (renamed from Documentation/devicetree/bindings/power_supply/tps65217_charger.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/twl-charger.txt (renamed from Documentation/devicetree/bindings/power/twl-charger.txt) | 0 | ||||
| -rw-r--r-- | Documentation/driver-model/devres.txt | 4 | ||||
| -rw-r--r-- | Documentation/power/power_supply_class.txt | 4 | ||||
| -rw-r--r-- | MAINTAINERS | 46 | ||||
| -rw-r--r-- | drivers/power/Kconfig | 518 | ||||
| -rw-r--r-- | drivers/power/Makefile | 75 | ||||
| -rw-r--r-- | drivers/power/act8945a_charger.c | 359 | ||||
| -rw-r--r-- | drivers/power/reset/keystone-reset.c | 2 | ||||
| -rw-r--r-- | drivers/power/reset/reboot-mode.c | 59 | ||||
| -rw-r--r-- | drivers/power/reset/reboot-mode.h | 4 | ||||
| -rw-r--r-- | drivers/power/reset/st-poweroff.c | 41 | ||||
| -rw-r--r-- | drivers/power/reset/syscon-reboot-mode.c | 12 | ||||
| -rw-r--r-- | drivers/power/reset/xgene-reboot.c | 4 | ||||
| -rw-r--r-- | drivers/power/reset/zx-reboot.c | 5 | ||||
| -rw-r--r-- | drivers/power/supply/88pm860x_battery.c (renamed from drivers/power/88pm860x_battery.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/88pm860x_charger.c (renamed from drivers/power/88pm860x_charger.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/Kconfig | 514 | ||||
| -rw-r--r-- | drivers/power/supply/Makefile | 74 | ||||
| -rw-r--r-- | drivers/power/supply/ab8500_bmdata.c (renamed from drivers/power/ab8500_bmdata.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/ab8500_btemp.c (renamed from drivers/power/ab8500_btemp.c) | 2 | ||||
| -rw-r--r-- | drivers/power/supply/ab8500_charger.c (renamed from drivers/power/ab8500_charger.c) | 4 | ||||
| -rw-r--r-- | drivers/power/supply/ab8500_fg.c (renamed from drivers/power/ab8500_fg.c) | 11 | ||||
| -rw-r--r-- | drivers/power/supply/abx500_chargalg.c (renamed from drivers/power/abx500_chargalg.c) | 4 | ||||
| -rw-r--r-- | drivers/power/supply/act8945a_charger.c | 666 | ||||
| -rw-r--r-- | drivers/power/supply/apm_power.c (renamed from drivers/power/apm_power.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/axp20x_usb_power.c (renamed from drivers/power/axp20x_usb_power.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/axp288_charger.c (renamed from drivers/power/axp288_charger.c) | 1 | ||||
| -rw-r--r-- | drivers/power/supply/axp288_fuel_gauge.c (renamed from drivers/power/axp288_fuel_gauge.c) | 1 | ||||
| -rw-r--r-- | drivers/power/supply/bq2415x_charger.c (renamed from drivers/power/bq2415x_charger.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/bq24190_charger.c (renamed from drivers/power/bq24190_charger.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/bq24257_charger.c (renamed from drivers/power/bq24257_charger.c) | 12 | ||||
| -rw-r--r-- | drivers/power/supply/bq24735-charger.c (renamed from drivers/power/bq24735-charger.c) | 45 | ||||
| -rw-r--r-- | drivers/power/supply/bq25890_charger.c (renamed from drivers/power/bq25890_charger.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/bq27xxx_battery.c (renamed from drivers/power/bq27xxx_battery.c) | 43 | ||||
| -rw-r--r-- | drivers/power/supply/bq27xxx_battery_i2c.c (renamed from drivers/power/bq27xxx_battery_i2c.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/charger-manager.c (renamed from drivers/power/charger-manager.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/collie_battery.c (renamed from drivers/power/collie_battery.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/da9030_battery.c (renamed from drivers/power/da9030_battery.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/da9052-battery.c (renamed from drivers/power/da9052-battery.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/da9150-charger.c (renamed from drivers/power/da9150-charger.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/da9150-fg.c (renamed from drivers/power/da9150-fg.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/ds2760_battery.c (renamed from drivers/power/ds2760_battery.c) | 7 | ||||
| -rw-r--r-- | drivers/power/supply/ds2780_battery.c (renamed from drivers/power/ds2780_battery.c) | 4 | ||||
| -rw-r--r-- | drivers/power/supply/ds2781_battery.c (renamed from drivers/power/ds2781_battery.c) | 4 | ||||
| -rw-r--r-- | drivers/power/supply/ds2782_battery.c (renamed from drivers/power/ds2782_battery.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/generic-adc-battery.c (renamed from drivers/power/generic-adc-battery.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/goldfish_battery.c (renamed from drivers/power/goldfish_battery.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/gpio-charger.c (renamed from drivers/power/gpio-charger.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/intel_mid_battery.c (renamed from drivers/power/intel_mid_battery.c) | 3 | ||||
| -rw-r--r-- | drivers/power/supply/ipaq_micro_battery.c (renamed from drivers/power/ipaq_micro_battery.c) | 2 | ||||
| -rw-r--r-- | drivers/power/supply/isp1704_charger.c (renamed from drivers/power/isp1704_charger.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/jz4740-battery.c (renamed from drivers/power/jz4740-battery.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/lp8727_charger.c (renamed from drivers/power/lp8727_charger.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/lp8788-charger.c (renamed from drivers/power/lp8788-charger.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/ltc2941-battery-gauge.c (renamed from drivers/power/ltc2941-battery-gauge.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/max14577_charger.c (renamed from drivers/power/max14577_charger.c) | 4 | ||||
| -rw-r--r-- | drivers/power/supply/max17040_battery.c (renamed from drivers/power/max17040_battery.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/max17042_battery.c (renamed from drivers/power/max17042_battery.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/max77693_charger.c (renamed from drivers/power/max77693_charger.c) | 4 | ||||
| -rw-r--r-- | drivers/power/supply/max8903_charger.c (renamed from drivers/power/max8903_charger.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/max8925_power.c (renamed from drivers/power/max8925_power.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/max8997_charger.c (renamed from drivers/power/max8997_charger.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/max8998_charger.c (renamed from drivers/power/max8998_charger.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/olpc_battery.c (renamed from drivers/power/olpc_battery.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/pcf50633-charger.c (renamed from drivers/power/pcf50633-charger.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/pda_power.c (renamed from drivers/power/pda_power.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/pm2301_charger.c (renamed from drivers/power/pm2301_charger.c) | 3 | ||||
| -rw-r--r-- | drivers/power/supply/pm2301_charger.h (renamed from drivers/power/pm2301_charger.h) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/pmu_battery.c (renamed from drivers/power/pmu_battery.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/power_supply.h (renamed from drivers/power/power_supply.h) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/power_supply_core.c (renamed from drivers/power/power_supply_core.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/power_supply_leds.c (renamed from drivers/power/power_supply_leds.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/power_supply_sysfs.c (renamed from drivers/power/power_supply_sysfs.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/qcom_smbb.c (renamed from drivers/power/qcom_smbb.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/rt5033_battery.c (renamed from drivers/power/rt5033_battery.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/rt9455_charger.c (renamed from drivers/power/rt9455_charger.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/rx51_battery.c (renamed from drivers/power/rx51_battery.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/s3c_adc_battery.c (renamed from drivers/power/s3c_adc_battery.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/sbs-battery.c (renamed from drivers/power/sbs-battery.c) | 254 | ||||
| -rw-r--r-- | drivers/power/supply/smb347-charger.c (renamed from drivers/power/smb347-charger.c) | 0 | ||||
| -rw-r--r-- | drivers/power/supply/test_power.c (renamed from drivers/power/test_power.c) | 0 |