2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-30 16:13:54 +08:00
linux-next/drivers/power
Linus Torvalds 814a2bf957 Merge branch 'akpm' (patches from Andrew)
Merge second patch-bomb from Andrew Morton:

 - a couple of hotfixes

 - the rest of MM

 - a new timer slack control in procfs

 - a couple of procfs fixes

 - a few misc things

 - some printk tweaks

 - lib/ updates, notably to radix-tree.

 - add my and Nick Piggin's old userspace radix-tree test harness to
   tools/testing/radix-tree/.  Matthew said it was a godsend during the
   radix-tree work he did.

 - a few code-size improvements, switching to __always_inline where gcc
   screwed up.

 - partially implement character sets in sscanf

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits)
  sscanf: implement basic character sets
  lib/bug.c: use common WARN helper
  param: convert some "on"/"off" users to strtobool
  lib: add "on"/"off" support to kstrtobool
  lib: update single-char callers of strtobool()
  lib: move strtobool() to kstrtobool()
  include/linux/unaligned: force inlining of byteswap operations
  include/uapi/linux/byteorder, swab: force inlining of some byteswap operations
  include/asm-generic/atomic-long.h: force inlining of some atomic_long operations
  usb: common: convert to use match_string() helper
  ide: hpt366: convert to use match_string() helper
  ata: hpt366: convert to use match_string() helper
  power: ab8500: convert to use match_string() helper
  power: charger_manager: convert to use match_string() helper
  drm/edid: convert to use match_string() helper
  pinctrl: convert to use match_string() helper
  device property: convert to use match_string() helper
  lib/string: introduce match_string() helper
  radix-tree tests: add test for radix_tree_iter_next
  radix-tree tests: add regression3 test
  ...
2016-03-18 19:26:54 -07:00
..
avs PM / AVS: rockchip-io: Fix module autoload for OF platform driver 2015-10-14 02:38:53 +02:00
reset power: reset: Fix dependencies for !HAS_IOMEM archs 2016-02-15 06:06:07 +01:00
88pm860x_battery.c 88pm860x_battery: Convert to using managed resources 2015-09-22 13:35:31 +02:00
88pm860x_charger.c power_supply: 88pm860x_charger: do not pass NULL to power_supply_put 2016-03-03 15:07:22 +01: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 power: ab8500: convert to use match_string() helper 2016-03-17 15:09:34 -07:00
ab8500_charger.c power: ab8500: convert to use match_string() helper 2016-03-17 15:09:34 -07:00
ab8500_fg.c power: ab8500: convert to use match_string() helper 2016-03-17 15:09:34 -07:00
abx500_chargalg.c power: ab8500: convert to use match_string() helper 2016-03-17 15:09:34 -07:00
act8945a_charger.c power: act8945a: add charger driver for ACT8945A 2016-02-24 18:31:24 +01:00
apm_power.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
axp20x_usb_power.c power: Add an axp20x-usb-power driver 2015-09-22 13:35:28 +02:00
axp288_charger.c power: axp288_charger: fix for API change 2015-06-26 17:44:09 -07:00
axp288_fuel_gauge.c power: axp288_fuel_gauge: Constify platform_device_id 2015-05-23 19:44:14 +02:00
bq27xxx_battery_i2c.c power supply and reset changes for the v4.6 series 2016-03-17 12:50:55 -07:00
bq27xxx_battery.c power_supply: bq27xxx_battery: Add of modalias and match table when CONFIG_OF is enabled 2016-02-21 20:26:00 +01:00
bq2415x_charger.c power_supply: bq2415x_charger: Add of modalias and match table when CONFIG_OF is enabled 2016-02-21 20:25:49 +01:00
bq24190_charger.c power: Remove unnecessary MODULE_ALIAS() for I2C drivers 2015-09-22 13:35:30 +02:00
bq24257_charger.c power: bq24257: Add various device-specific sysfs properties 2015-09-29 16:55:03 +02:00
bq24735-charger.c power: bq24735-charger: add 'ti,external-control' option 2016-02-15 06:36:10 +01:00
bq25890_charger.c power_supply: bq25890: use flags argument of devm_gpiod_get 2015-06-13 04:06:33 +02:00
charger-manager.c power: charger_manager: convert to use match_string() helper 2016-03-17 15:09:34 -07:00
collie_battery.c power: collie_battery: hide unused variable 2016-02-15 06:01:51 +01:00
da9030_battery.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
da9052-battery.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
da9150-charger.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
da9150-fg.c power: Add support for DA9150 Fuel-Gauge 2015-10-13 11:28:07 +01:00
ds2760_battery.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
ds2780_battery.c power: ds2780_battery: clean up eeprom read/write functions 2015-07-27 16:28:54 +02:00
ds2781_battery.c power: ds2781_battery: clean up eeprom read/write functions 2015-07-27 16:28:54 +02:00
ds2782_battery.c power: ds2782_battery: constify ds278x_battery_ops structure 2015-12-05 02:06:49 +01:00
generic-adc-battery.c power: generic-adc-battery: use to_delayed_work 2016-01-07 16:38:31 +01:00
goldfish_battery.c goldfish: Enable ACPI-based enumeration for goldfish battery 2016-03-03 13:55:36 +01:00
gpio-charger.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
intel_mid_battery.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
ipaq_micro_battery.c power: ipaq-micro-battery: use __maybe_unused to hide pm functions 2016-03-03 15:12:08 +01:00
isp1704_charger.c power_supply: isp1704_charger: Add compatible of match for nxp,isp1707 2016-02-21 20:25:09 +01:00
jz4740-battery.c jz4740-battery: Correct voltage change check 2016-03-03 15:05:08 +01:00
Kconfig power: act8945a: add charger driver for ACT8945A 2016-02-24 18:31:24 +01:00
lp8727_charger.c power:lp8727_charger: parsing child node after getting debounce-ms 2015-09-22 13:35:29 +02:00
lp8788-charger.c power_supply: lp8788-charger: initialize boolean 'found' 2016-03-03 15:01:49 +01:00
ltc2941-battery-gauge.c power/ltc2941-battery-gauge.c: Use the devicetree node name as supply name 2015-07-24 16:52:24 +02:00
Makefile power: act8945a: add charger driver for ACT8945A 2016-02-24 18:31:24 +01:00
max8903_charger.c power: max8903_charger: set IRQF_ONESHOT if no primary handler is specified 2015-12-05 02:06:50 +01:00
max8925_power.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
max8997_charger.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
max8998_charger.c power_supply: max8998: Use devm_power_supply_register 2015-09-22 16:20:10 +02:00
max14577_charger.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
max17040_battery.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
max17042_battery.c power: max17042_battery: Convert to using managed resources 2015-09-22 16:01:34 +02:00
max77693_charger.c drivers: max77693: Move state container to common header 2015-07-16 21:39:30 +01:00
olpc_battery.c power: olpc_battery: clean up eeprom read function 2015-07-27 16:28:54 +02:00
pcf50633-charger.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
pda_power.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
pm2301_charger.c power: pm2301-charger: use __maybe_unused to hide pm functions 2016-03-03 15:12:08 +01:00
pm2301_charger.h power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
pmu_battery.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
power_supply_core.c thermal: consistently use int for temperatures 2015-08-03 23:15:50 +08:00
power_supply_leds.c power_supply: Use wrappers to avoid races when registering power supply 2015-05-23 20:06:19 +02:00
power_supply_sysfs.c power_supply: Add types for USB Type C and PD chargers 2016-02-15 07:02:32 +01:00
power_supply.h device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
qcom_smbb.c power: qcom_smbb: test the correct variable 2015-09-24 22:35:24 +02:00
rt5033_battery.c power: Export I2C module alias information in missing drivers 2015-08-05 05:39:08 +02:00
rt9455_charger.c power: Remove unnecessary MODULE_ALIAS() for I2C drivers 2015-09-22 13:35:30 +02:00
rx51_battery.c rx51-battery: Set name to rx51-battery 2015-08-03 17:14:57 +02:00
s3c_adc_battery.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
sbs-battery.c sbs-battery: add option to always register battery 2015-06-10 16:18:46 +02:00
smb347-charger.c power: Remove unnecessary MODULE_ALIAS() for I2C drivers 2015-09-22 13:35:30 +02:00
test_power.c power: test_power: correctly handle empty writes 2016-01-07 18:39:34 +01:00
tosa_battery.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
tps65090-charger.c tps65090-charger: Fix module autoload for OF platform driver 2015-09-22 16:03:37 +02:00
tps65217_charger.c power_supply: Add support for tps65217-charger. 2015-09-24 22:43:13 +02:00
twl4030_charger.c drivers: power: twl4030_charger: fix link problems when building as module 2015-09-26 19:10:09 +02:00
twl4030_madc_battery.c power: twl4030_madc_battery: Add missing MODULE_ALIAS 2015-04-06 19:39:57 +02:00
wm97xx_battery.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
wm831x_backup.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
wm831x_power.c wm831x_power: Use IRQF_ONESHOT to request threaded IRQs 2015-09-26 18:55:09 +02:00
wm8350_power.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00
z2_battery.c power_supply: Change ownership from driver to core 2015-03-13 23:15:51 +01:00