2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 07:04:00 +08:00
linux-next/drivers/power
Linus Torvalds 50fa86172b power supply and reset changes for the v3.18 series
- Initial support for the following chips
   * max77836 (charger)
   * max14577 (charger)
   * bq27742 (battery gauge)
   * ltc2952 (poweroff)
   * stih416 (restart)
   * syscon-reboot (restart)
   * gpio-restart (restart)
  - cleanup of power supply core
  - misc. fixes in power supply and reset drivers
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCgAGBQJUOWD7AAoJENju1/PIO/qaj5QP/AtbG96NRpX6Ou8W+qulhSbe
 npTKItRMERZhV+lJUAdmLxQq8Cy6I5Cobdj140oIM6HIKZ7Dh6jChxd2t+RCLsO0
 Y16VMq45L9E/mQuVCLqSSNCPKrRjbF7hW+8gpym/Yc846o3Fv8nhTQzkWxCsVrDR
 rNerRnrUyvKpqRpCN88u4ZuOHjm/146nZtTsAzvL8nGnQBZFJHv4eu7D5nwSN0QS
 FrLiI/mE7h1KFcdK5LrZf51IfEP9w4RVV3vs1wEuP0iPS5dguv2dNzXXVZa5eD/2
 AYSSouVKkgdwryLAvIIaDLD405UYl5Xgt5J6d+QKXxm2+eeZMEY36+PEK5WtRtBX
 CykzO2BgvxyOdz2HU9D8irR1Li71jVSWwQITMJ6bQsbKEQAhltmkmsTOxtqB+ekd
 254rKcKWTqllmEhg1LR8PCidf8OZNEcKzXi4XmQdQIcKNF9tvdTXP5c0/FzuIAlQ
 tqWZW1kQK6/TTfx+XxeeszJWY5VknIaka2Bi83pOZYtu94CtUFBdEVkpaYmC433+
 qLOto7VMy+AKYViTJJDDEnSEFiLNZz/zF+SUDf+YB1RelULSF3zC8CbDcZQa5fNm
 4qTU1fl2gGrIZ1jDPPihm6xP8r9WkeuQWEytG2UJZoa+l4XmzfLHBUUDVo0zqTd3
 txfmKca8Y3GhXGwINi1m
 =sj9S
 -----END PGP SIGNATURE-----

Merge tag 'for-v3.18' of git://git.infradead.org/battery-2.6

Pull power supply and reset updates from Sebastian Reichel:
 - Initial support for the following chips
   * max77836 (charger)
   * max14577 (charger)
   * bq27742 (battery gauge)
   * ltc2952 (poweroff)
   * stih416 (restart)
   * syscon-reboot (restart)
   * gpio-restart (restart)
 - cleanup of power supply core
 - misc fixes in power supply and reset drivers

* tag 'for-v3.18' of git://git.infradead.org/battery-2.6: (48 commits)
  power: ab8500_fg: Fix build warning
  Documentation: charger: max14577: Update the date of introducing ABI
  power: reset: corrections for simple syscon reboot driver
  Documentation: power: reset: Add documentation for generic SYSCON reboot driver
  power: reset: Add generic SYSCON register mapped reset
  bq27x00_battery: Fix flag reading for bq27742
  power: reset: use restart_notifier mechanism for msm-poweroff
  power: Add simple gpio-restart driver
  power: reset: st: Provide DT bindings for ST's Power Reset driver
  power: reset: Add restart functionality for STiH41x platforms
  power: charger-manager: Fix NULL pointer exception with missing cm-fuel-gauge
  power: max14577: Fix circular config SYSFS dependency
  power: gpio-charger: do not use gpio value directly
  power: max8925: Use of_get_child_by_name
  power: max8925: Fix NULL ptr dereference on memory allocation failure
  bq27x00_battery: Add support to bq27742
  Documentation: charger: max14577: Document exported sysfs entry
  devicetree: mfd: max14577: Add device tree bindings document
  power: max17040: Add ID for MAX77836 Fuel Gauge block
  charger: max14577: Configure battery-dependent settings from DTS and sysfs
  ...

Conflicts:
	drivers/power/reset/Kconfig
	drivers/power/reset/Makefile
2014-10-15 06:56:23 +02:00
..
avs PM / AVS: rockchip-io: add driver handling Rockchip io domains 2014-09-25 09:57:23 -07:00
reset power supply and reset changes for the v3.18 series 2014-10-15 06:56:23 +02:00
88pm860x_battery.c 88pm860x_battery: Remove unnecessary platform_set_drvdata() 2013-06-06 17:12:37 -07:00
88pm860x_charger.c treewide: Fix typo in printk 2013-08-20 12:44:03 +02:00
ab8500_bmdata.c ab8500_bmdata: Export abx500_res_to_temp tables for hwmon 2013-04-16 17:38:10 -07:00
ab8500_btemp.c ab8500_bm: Remove unnecessary platform_set_drvdata() 2013-06-06 17:13:09 -07:00
ab8500_charger.c ab8500-charger: Remove redundant break 2013-10-25 15:36:23 -07:00
ab8500_fg.c power: ab8500_fg: Fix build warning 2014-10-05 02:10:20 +02:00
abx500_chargalg.c ab8500_bm: Remove unnecessary platform_set_drvdata() 2013-06-06 17:13:09 -07:00
apm_power.c
bq27x00_battery.c bq27x00_battery: Fix flag reading for bq27742 2014-10-01 04:10:50 +02:00
bq2415x_charger.c bq2415x_charger: Fix Atomic Sleep Bug 2014-07-18 23:40:22 +02:00
bq24190_charger.c bq24190_charger: Workaround SS definition problem on i386 builds 2013-08-28 17:52:50 -07:00
bq24735-charger.c power_supply: Add support for bq24735 charger 2013-10-25 15:56:51 -07:00
charger-manager.c power: charger-manager: Fix NULL pointer exception with missing cm-fuel-gauge 2014-09-26 17:09:56 +02:00
collie_battery.c power supply: collie_battery: Convert to use dev_pm_ops 2013-08-09 13:41:06 -07:00
da9030_battery.c da9030_battery: Use devm_kzalloc() 2013-03-31 23:25:51 -07:00
da9052-battery.c da9052-battery: Use devm_kzalloc() 2013-03-31 23:25:49 -07:00
ds2760_battery.c ds2760_battery: Use devm_kzalloc() 2013-03-31 23:25:47 -07:00
ds2780_battery.c ds2780_battery: Use devm_kzalloc() 2013-03-31 23:25:45 -07:00
ds2781_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
ds2782_battery.c power: ds2782_battery: Typo in comment 2014-01-25 15:24:15 +04:00
generic-adc-battery.c generic-adc-battery: Fix checking if none of the channels are supported 2013-06-06 17:33:40 -07:00
goldfish_battery.c goldfish_battery: Use resource_size() 2013-03-31 23:39:40 -07:00
gpio-charger.c power: gpio-charger: do not use gpio value directly 2014-09-25 01:45:59 +02:00
intel_mid_battery.c power: Use platform_{get,set}_drvdata() 2013-06-06 17:30:46 -07:00
ipaq_micro_battery.c ipaq_micro_battery: fix sparse non static symbol warning 2014-07-28 15:36:29 +02:00
isp1704_charger.c isp1704_charger: remove useless check in isp1704_charger_probe() 2014-01-25 15:24:15 +04:00
jz4740-battery.c tree-wide: use reinit_completion instead of INIT_COMPLETION 2013-11-15 09:32:21 +09:00
Kconfig power: max14577: Fix circular config SYSFS dependency 2014-09-25 16:05:50 +02:00
lp8727_charger.c lp8727_charger: Support the device tree feature 2013-06-06 17:19:54 -07:00
lp8788-charger.c lp8788-charger: Use PAGE_SIZE for the sysfs read operation 2013-03-31 23:33:19 -07:00
Makefile power: add driver for battery reading on iPaq h3xxx 2014-07-24 16:20:17 +02:00
max8903_charger.c max8903_charger: Use devm_kzalloc() 2013-03-31 23:25:38 -07:00
max8925_power.c power: max8925: Use of_get_child_by_name 2014-09-25 01:37:13 +02:00
max8997_charger.c max8997_charger: Use devm_kzalloc() 2013-03-31 23:25:36 -07:00
max8998_charger.c max8998_charger: Use devm_kzalloc() 2013-03-31 23:25:34 -07:00
max14577_charger.c charger: max14577: Configure battery-dependent settings from DTS and sysfs 2014-09-24 15:25:49 +01:00
max17040_battery.c power: max17040: Add ID for MAX77836 Fuel Gauge block 2014-09-24 15:25:52 +01:00
max17042_battery.c max17042_battery: Add IRQF_ONESHOT flag to use default irq handler 2013-12-23 18:59:41 -08:00
olpc_battery.c Drivers: power: remove __dev* attributes. 2013-01-03 15:57:14 -08:00
pcf50633-charger.c power_supply: Replace strict_strtoul() with kstrtoul() 2013-06-06 17:35:38 -07:00
pda_power.c usb: power: pda_power: check against CONFIG_USB_PHY 2013-03-18 11:18:05 +02:00
pm2301_charger.c pm2301-charger: Remove unneeded NULL checks 2013-11-12 22:36:34 -08:00
pm2301_charger.h pm2301-charger: Removed unused code from PM2301 driver 2013-03-07 12:35:53 +08:00
pmu_battery.c
power_supply_core.c power_supply: Don't iterate over devices to return -EPROBE_DEFER 2014-09-16 11:01:38 +02:00
power_supply_leds.c power-supply: Avoid unnecessary 'goto' statements 2014-09-16 11:01:37 +02:00
power_supply_sysfs.c power-supply: Check for failures only when we can fail 2014-09-16 11:01:37 +02:00
power_supply.h
rx51_battery.c rx51_battery: convert to iio consumer 2014-07-18 23:40:22 +02:00
s3c_adc_battery.c s3c-adc-battery: Fix possible NULL pointer dereference 2013-03-18 19:43:03 -07:00
sbs-battery.c sbs-battery: add min design voltage to sbs-battery 2014-09-06 20:57:43 +02:00
smb347-charger.c power: remove use of __devexit_p 2012-11-28 11:43:22 -08:00
test_power.c test_power: Fix a bug in setting module parameter values 2013-03-18 19:27:31 -07:00
tosa_battery.c power_supply: tosa_battery: Get rid of irq_to_gpio usage 2013-08-09 13:41:52 -07:00
tps65090-charger.c charger: tps65090: Allow charger module to be used when no irq 2014-07-18 23:40:23 +02:00
twl4030_charger.c power: twl4030_charger: detect battery presence prior to enabling charger 2014-07-23 13:58:33 +02:00
twl4030_madc_battery.c power: Add twl4030_madc battery driver. 2013-08-30 17:34:52 -07:00
wm97xx_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
wm831x_backup.c wm831x_backup: Fix wrong kfree call for devdata->backup.name 2013-05-10 11:56:22 -07:00
wm831x_power.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
wm8350_power.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
z2_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00