Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbcd9c53 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply 

Pull power supply and reset updates from Sebastian Reichel:

 - new driver for Intel PIIX4

 - lots of module autoload fixes

 - misc fixes

* tag 'for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  power_supply: wm97xx_battery: use power_supply_get_drvdata
  wm8350_power: use permission-specific DEVICE_ATTR variants
  power: ipaq_micro_battery: fix alias
  power: supply: bq27xxx_battery: Fix register map for BQ27510 and BQ27520
  bq24190_charger: Fix PM runtime use for bq24190_battery_set_property
  power: supply: lp8788: remove an unneeded NULL check
  power: reset: zx-reboot: Fix module autoload
  power: reset: syscon-reboot-mode: Fix module autoload
  power: reset: at91-poweroff: Fix module autoload
  power: reset: at91-reset: Fix module autoload
  power: supply: axp288_fuel_gauge: Fix module autoload
  power: supply: max8997_charger: Fix module autoload
  power: supply: max17040: Change register transaction length from 8 bits to 16 bits
  power: supply: bq27xxx_battery: don't update poll_interval param if same
  power: supply: improve function-level documentation
  power: reset: Add Intel PIIX4 poweroff driver
parents ce38207f 6480af49

drivers/input/touchscreen/wm97xx-core.c

+1 −1
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ static int wm97xx_probe(struct device *dev) 
	}

	platform_set_drvdata(wm->battery_dev, wm);

	wm->battery_dev->dev.parent = dev;

	wm->battery_dev->dev.platform_data = pdata;

	wm->battery_dev->dev.platform_data = pdata->batt_pdata;

	ret = platform_device_add(wm->battery_dev);

	if (ret < 0)

		goto batt_reg_err;

drivers/power/reset/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -104,6 +104,16 @@ config POWER_RESET_MSM 
	help

	  Power off and restart support for Qualcomm boards.



config POWER_RESET_PIIX4_POWEROFF

	tristate "Intel PIIX4 power-off driver"

	depends on PCI

	depends on MIPS || COMPILE_TEST

	help

	  This driver supports powering off a system using the Intel PIIX4

	  southbridge, for example the MIPS Malta development board. The

	  southbridge SOff state is entered in response to a request to

	  power off the system.



config POWER_RESET_LTC2952

	bool "LTC2952 PowerPath power-off driver"

	depends on OF_GPIO

drivers/power/reset/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ obj-$(CONFIG_POWER_RESET_GPIO_RESTART) += gpio-restart.o 
obj-$(CONFIG_POWER_RESET_HISI) += hisi-reboot.o

obj-$(CONFIG_POWER_RESET_IMX) += imx-snvs-poweroff.o

obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o

obj-$(CONFIG_POWER_RESET_PIIX4_POWEROFF) += piix4-poweroff.o

obj-$(CONFIG_POWER_RESET_LTC2952) += ltc2952-poweroff.o

obj-$(CONFIG_POWER_RESET_QNAP) += qnap-poweroff.o

obj-$(CONFIG_POWER_RESET_RESTART) += restart-poweroff.o

drivers/power/reset/at91-poweroff.c

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ static const struct of_device_id at91_poweroff_of_match[] = { 
	{ .compatible = "atmel,at91sam9x5-shdwc", },

	{ /*sentinel*/ }

};

MODULE_DEVICE_TABLE(of, at91_poweroff_of_match);



static struct platform_driver at91_poweroff_driver = {

	.remove = __exit_p(at91_poweroff_remove),

drivers/power/reset/at91-reset.c

+2 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ static const struct of_device_id at91_reset_of_match[] = { 
	{ .compatible = "atmel,sama5d3-rstc", .data = sama5d3_restart },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, at91_reset_of_match);



static struct notifier_block at91_restart_nb = {

	.priority = 192,
@@ -242,6 +243,7 @@ static const struct platform_device_id at91_reset_plat_match[] = { 
	{ "at91-sam9g45-reset", (unsigned long)at91sam9g45_restart },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(platform, at91_reset_plat_match);



static struct platform_driver at91_reset_driver = {

	.remove = __exit_p(at91_reset_remove),