Commit 972058ad authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull power supply and reset updates from Sebastian Reichel:

 - bq27xxx: add bq27521 support

 - drop unused imx-snvs-poweroff driver

 - improve axp288 driver

 - misc fixes

* tag 'for-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (32 commits)
  power: supply: max17042_battery: Always fall back to default platform-data
  power: supply: max17042_battery: Check battery current for status when supplied
  MAINTAINERS: Add AXP288 PMIC entry
  power: supply: axp288_fuel_gauge: Do not register our psy on (some) HDMI sticks
  power: supply: axp288_fuel_gauge: Optimize get_current()
  power: supply: axp288_fuel_gauge: Rework get_status()
  power: reset: account for const type of of_device_id.data
  power: supply: account for const type of of_device_id.data
  bq24190: Simplify code in property_is_writeable
  power: supply: axp288_fuel_gauge: Get iio-channels once during boot
  power: supply: axp288_charger: Properly stop work on probe-error / remove
  power: supply: axp288_charger: Simplify extcon cable handling
  power: supply: axp288_charger: Use the right property for the input current limit
  power: supply: axp288_charger: Pick lower input current limit not higher
  power: supply: axp288_charger: Do not cache input current limit value
  power: supply: axp288_charger: Remove no longer needed locking
  power: supply: axp288_charger: Use regmap_update_bits to set the input limits
  power: supply: axp288_charger: Cleanup some double empty lines
  power: supply: axp288_charger: Remove charger-enabled state tracking
  power: supply: axp288_charger: Add missing newlines to some messages
  ...
parents a9e89e54 2d7e6a83

Documentation/devicetree/bindings/power/reset/imx-snvs-poweroff.txt

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
i.mx6 Poweroff Driver



SNVS_LPCR in SNVS module can power off the whole system by pull

PMIC_ON_REQ low if PMIC_ON_REQ is connected with external PMIC.

If you don't want to use PMIC_ON_REQ as power on/off control,

please set status='disabled' to disable this driver.



Required Properties:

-compatible: "fsl,sec-v4.0-poweroff"

-reg: Specifies the physical address of the SNVS_LPCR register



Example:

	snvs@20cc000 {

		compatible = "fsl,sec-v4.0-mon", "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0 0x020cc000 0x4000>;

		.....

		snvs_poweroff: snvs-poweroff@38 {

			compatible = "fsl,sec-v4.0-poweroff";

			reg = <0x38 0x4>;

		};

	}

Documentation/devicetree/bindings/power/supply/bq27xxx.txt

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ Required properties: 
 * "ti,bq27520g2" - BQ27520-g2

 * "ti,bq27520g3" - BQ27520-g3

 * "ti,bq27520g4" - BQ27520-g4

 * "ti,bq27521" - BQ27521

 * "ti,bq27530" - BQ27530

 * "ti,bq27531" - BQ27531

 * "ti,bq27541" - BQ27541

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -14909,6 +14909,12 @@ F: include/linux/workqueue.h 
F:	kernel/workqueue.c

F:	Documentation/core-api/workqueue.rst



X-POWERS AXP288 PMIC DRIVERS

M:	Hans de Goede <hdegoede@redhat.com>

S:	Maintained

N:	axp288

F:	drivers/acpi/pmic/intel_pmic_xpower.c



X-POWERS MULTIFUNCTION PMIC DEVICE DRIVERS

M:	Chen-Yu Tsai <wens@csie.org>

L:	linux-kernel@vger.kernel.org

drivers/power/reset/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -98,15 +98,6 @@ config POWER_RESET_HISI 
	help

	  Reboot support for Hisilicon boards.



config POWER_RESET_IMX

	bool "IMX6 power-off driver"

	depends on POWER_RESET && SOC_IMX6

	help

	  This driver support power off external PMIC by PMIC_ON_REQ on i.mx6

	  boards.If you want to use other pin to control external power,please

	  say N here or disable in dts to make sure pm_power_off never be

	  overwrote wrongly by this driver.



config POWER_RESET_MSM

	bool "Qualcomm MSM power-off driver"

	depends on ARCH_QCOM

drivers/power/reset/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ obj-$(CONFIG_POWER_RESET_GEMINI_POWEROFF) += gemini-poweroff.o 
obj-$(CONFIG_POWER_RESET_GPIO) += gpio-poweroff.o

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE