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

Commit 6b402bdf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more power-supply updates from Sebastian Reichel:
 "The power-supply subsystem has a few more changes for the v4.12 merge
  window:

   - New battery driver for AXP20X and AXP22X PMICs

   - Improve max17042_battery for usage on x86

   - Misc small cleanups & fixes"

* tag 'for-v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (34 commits)
  power: supply: cpcap-charger: Keep trickle charger bits disabled
  power: supply: cpcap-charger: Fix enable for 3.8V charge setting
  power: supply: cpcap-charger: Fix charge voltage configuration
  power: supply: cpcap-charger: Fix charger name
  power: supply: twl4030-charger: make twl4030_bci_property_is_writeable static
  power: supply: sbs-battery: Add alert callback
  mailmap: add Sebastian Reichel
  power: supply: avoid unused twl4030-madc.h
  power: supply: sbs-battery: Correct supply status with current draw
  power: supply: sbs-battery: Don't ignore the first external power change
  power: supply: pda_power: move from timer to delayed_work
  power: supply: max17042_battery: Add support for the SCOPE property
  power: supply: max17042_battery: Add support for the CHARGE_NOW property
  power: supply: max17042_battery: Add support for the CHARGE_FULL_DESIGN property
  power: supply: max17042_battery: mAh readings depend on r_sns value
  power: supply: max17042_battery: Add support for the VOLT_MIN property
  power: supply: max17042_battery: Add support for the TECHNOLOGY attribute
  power: supply: max17042_battery: Add external_power_changed callback
  power: supply: max17042_battery: Add support for the STATUS property
  power: supply: max17042_battery: Add default platform_data fallback data
  ...
parents 6a776e47 35f4f99c

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ Santosh Shilimkar <ssantosh@kernel.org> 
Santosh Shilimkar <santosh.shilimkar@oracle.org>

Sascha Hauer <s.hauer@pengutronix.de>

S.Çağlar Onur <caglar@pardus.org.tr>

Sebastian Reichel <sre@kernel.org> <sre@debian.org>

Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>

Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>

Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>

Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>

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

0 → 100644
+20 −0
Original line number Diff line number Diff line 
AXP20x and AXP22x battery power supply



Required Properties:

 - compatible, one of:

			"x-powers,axp209-battery-power-supply"

			"x-powers,axp221-battery-power-supply"



This node is a subnode of the axp20x/axp22x PMIC.



The AXP20X and AXP22X can read the battery voltage, charge and discharge

currents of the battery by reading ADC channels from the AXP20X/AXP22X

ADC.



Example:



&axp209 {

	battery_power_supply: battery-power-supply {

		compatible = "x-powers,axp209-battery-power-supply";

	}

};

drivers/power/supply/Kconfig

+20 −7
Original line number Diff line number Diff line
@@ -238,6 +238,26 @@ config CHARGER_AXP20X 
	  This driver can also be built as a module. If so, the module will be

	  called axp20x_ac_power.



config BATTERY_AXP20X

	tristate "X-Powers AXP20X battery driver"

	depends on MFD_AXP20X

	depends on AXP20X_ADC

	depends on IIO

	help

	  Say Y here to enable support for X-Powers AXP20X PMICs' battery power

	  supply.



	  This driver can also be built as a module. If so, the module will be

	  called axp20x_battery.



config AXP20X_POWER

	tristate "AXP20x power supply driver"

	depends on MFD_AXP20X

	depends on IIO

	help

	  This driver provides support for the power supply features of

	  AXP20x PMIC.



config AXP288_CHARGER

	tristate "X-Powers AXP288 Charger"

	depends on MFD_AXP20X && EXTCON_AXP288
@@ -541,11 +561,4 @@ config CHARGER_RT9455 
	help

	  Say Y to enable support for Richtek RT9455 battery charger.



config AXP20X_POWER

	tristate "AXP20x power supply driver"

	depends on MFD_AXP20X

	help

	  This driver provides support for the power supply features of

	  AXP20x PMIC.



endif # POWER_SUPPLY

drivers/power/supply/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ obj-$(CONFIG_TEST_POWER) += test_power.o 


obj-$(CONFIG_BATTERY_88PM860X)	+= 88pm860x_battery.o

obj-$(CONFIG_BATTERY_ACT8945A)	+= act8945a_charger.o

obj-$(CONFIG_BATTERY_AXP20X)	+= axp20x_battery.o

obj-$(CONFIG_CHARGER_AXP20X)	+= axp20x_ac_power.o

obj-$(CONFIG_BATTERY_DS2760)	+= ds2760_battery.o

obj-$(CONFIG_BATTERY_DS2780)	+= ds2780_battery.o

drivers/power/supply/ab8500_charger.c

+1 −1
Original line number Diff line number Diff line
@@ -3238,7 +3238,7 @@ static int ab8500_charger_init_hw_registers(struct ab8500_charger *di) 
			BUS_PP_PRECHG_CURRENT_MASK, 0);

		if (ret) {

			dev_err(di->dev,

				"failed to setup usb power path prechage current\n");

				"failed to setup usb power path precharge current\n");

			goto out;

		}

	}