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

Commit 0ce5c79f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull power supply and reset changes from Sebastian Reichel:
 "New chip/feature support:
   - bq27xxx: support updating battery config from DT
   - bq24190: support loading battery charge info from DT
   - LTC2941: add LTC2942/LTC2944 support
   - max17042: add ACPI support
   - max1721x: new driver

  Misc:
   - Move bq27xxx w1 driver from w1 into power-supply subsystem
   - Introduce power_supply_set_input_current_limit_from_supplier
   - constify stuff
   - some minor fixes"

* tag 'for-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (39 commits)
  power: supply: bq27xxx: enable writing capacity values for bq27421
  power: supply: bq24190_charger: Get input_current_limit from our supplier
  power: supply: bq24190_charger: Export 5V boost converter as regulator
  power: supply: bq24190_charger: Add power_supply_battery_info support
  power: supply: bq24190_charger: Add property system-minimum-microvolt
  power: supply: bq24190_charger: Enable devicetree config
  dt-bindings: power: supply: Add docs for TI BQ24190 battery charger
  power: supply: bq27xxx: Remove duplicate chip data arrays
  power: supply: bq27xxx: Enable data memory update for certain chips
  power: supply: bq27xxx: Add chip IDs for previously shadowed chips
  power: supply: bq27xxx: Create single chip data table
  power: supply: bq24190_charger: Add ti,bq24192i to devicetree table
  power: supply: bq24190_charger: Add input_current_limit property
  power: supply: Add power_supply_set_input_current_limit_from_supplier helper
  power: supply: max17042_battery: Fix compiler warning
  power: supply: core: Delete two error messages for a failed memory allocation in power_supply_check_supplies()
  power: supply: make device_attribute const
  power: supply: max17042_battery: Fix ACPI interrupt issues
  power: supply: max17042_battery: Add support for ACPI enumeration
  power: supply: lp8788: Make several arrays static const * const
  ...
parents 7151202b 5d01fd38

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

0 → 100644
+51 −0
Original line number Diff line number Diff line 
TI BQ24190 Li-Ion Battery Charger



Required properties:

- compatible: contains one of the following:

    * "ti,bq24190"

    * "ti,bq24192i"

- reg: integer, I2C address of the charger.

- interrupts[-extended]: configuration for charger INT pin.



Optional properties:

- monitored-battery: phandle of battery characteristics devicetree node

  The charger uses the following battery properties:

    + precharge-current-microamp: maximum charge current during precharge

      phase (typically 20% of battery capacity).

    + charge-term-current-microamp: a charge cycle terminates when the

      battery voltage is above recharge threshold, and the current is below

      this setting (typically 10% of battery capacity).

  See also Documentation/devicetree/bindings/power/supply/battery.txt

- ti,system-minimum-microvolt: when power is connected and the battery is below

  minimum system voltage, the system will be regulated above this setting.



Notes:

- Some circuit boards wire the chip's "OTG" pin high (enabling 500mA default

  charge current on USB SDP ports, among other features). To simulate this on

  boards that wire the pin to a GPIO, set a gpio-hog.



Example:



	bat: battery {

		compatible = "simple-battery";

		precharge-current-microamp = <256000>;

		charge-term-current-microamp = <128000>;

		// etc.

	};



	bq24190: charger@6a {

		compatible = "ti,bq24190";

		reg = <0x6a>;

		interrupts-extended = <&gpiochip 10 IRQ_TYPE_EDGE_FALLING>;

		monitored-battery = <&bat>;

		ti,system-minimum-microvolt = <3200000>;

	};



	&twl_gpio {

		otg {

			gpio-hog;

			gpios = <6 0>;

			output-high;

			line-name = "otg-gpio";

		};

	};

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

+8 −7
Original line number Diff line number Diff line 
binding for LTC2941 and LTC2943 battery gauges

binding for LTC2941, LTC2942, LTC2943 and LTC2944 battery gauges



Both the LTC2941 and LTC2943 measure battery capacity.

The LTC2943 is compatible with the LTC2941, it adds voltage and

temperature monitoring, and uses a slightly different conversion

formula for the charge counter.

All chips measure battery capacity.

The LTC2942 is pin compatible with the LTC2941, it adds voltage and

temperature monitoring, and is runtime detected. LTC2943 and LTC2944

is software compatible, uses a slightly different conversion formula

for the charge counter and adds voltage, current and temperature monitoring.



Required properties:

- compatible: Should contain "lltc,ltc2941" or "lltc,ltc2943" which also

    indicates the type of I2C chip attached.

- compatible: Should contain "lltc,ltc2941", "lltc,ltc2942", "lltc,ltc2943"

    or "lltc,ltc2944" which also indicates the type of I2C chip attached.

- reg: The 7-bit I2C address.

- lltc,resistor-sense: The sense resistor value in milli-ohms. Can be a 32-bit

    negative value when the battery has been connected to the wrong end of the

drivers/power/reset/at91-sama5d2_shdwc.c

+2 −2
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ static u32 at91_shdwc_get_wakeup_input(struct platform_device *pdev, 


	for_each_child_of_node(np, cnp) {

		if (of_property_read_u32(cnp, "reg", &wk_input)) {

			dev_warn(&pdev->dev, "reg property is missing for %s\n",

				 cnp->full_name);

			dev_warn(&pdev->dev, "reg property is missing for %pOF\n",

				 cnp);

			continue;

		}

drivers/power/supply/Kconfig

+23 −0
Original line number Diff line number Diff line
@@ -198,6 +198,15 @@ config BATTERY_BQ27XXX_I2C 
	  Say Y here to enable support for batteries with BQ27xxx chips

	  connected over an I2C bus.



config BATTERY_BQ27XXX_HDQ

	tristate "BQ27xxx HDQ support"

	depends on BATTERY_BQ27XXX

	depends on W1

	default y

	help

	  Say Y here to enable support for batteries with BQ27xxx chips

	  connected over an HDQ bus.



config BATTERY_BQ27XXX_DT_UPDATES_NVM

	bool "BQ27xxx support for update of NVM/flash data memory"

	depends on BATTERY_BQ27XXX_I2C
@@ -313,6 +322,19 @@ config BATTERY_MAX17042 
	  with MAX17042. This driver also supports max17047/50 chips which are

	  improved version of max17042.



config BATTERY_MAX1721X

	tristate "MAX17211/MAX17215 standalone gas-gauge"

	depends on W1

	select REGMAP_W1

	help

	  MAX1721x is fuel-gauge systems for lithium-ion (Li+) batteries

	  in handheld and portable equipment. MAX17211 used with single cell

	  battery. MAX17215 designed for muticell battery. Both them have

	  OneWire (W1) host interface.



	  Say Y here to enable support for the MAX17211/MAX17215 standalone

	  battery gas-gauge.



config BATTERY_Z2

	tristate "Z2 battery driver"

	depends on I2C && MACH_ZIPIT2
@@ -365,6 +387,7 @@ config BATTERY_RX51 
config CHARGER_CPCAP

	tristate "CPCAP PMIC Charger Driver"

	depends on MFD_CPCAP && IIO

	depends on OMAP_USB2 || (!OMAP_USB2 && COMPILE_TEST)

	default MFD_CPCAP

	help

	  Say Y to enable support for CPCAP PMIC charger driver for Motorola

drivers/power/supply/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -38,12 +38,14 @@ obj-$(CONFIG_BATTERY_SBS) += sbs-battery.o 
obj-$(CONFIG_CHARGER_SBS)	+= sbs-charger.o

obj-$(CONFIG_BATTERY_BQ27XXX)	+= bq27xxx_battery.o

obj-$(CONFIG_BATTERY_BQ27XXX_I2C) += bq27xxx_battery_i2c.o

obj-$(CONFIG_BATTERY_BQ27XXX_HDQ) += bq27xxx_battery_hdq.o

obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o

obj-$(CONFIG_BATTERY_DA9052)	+= da9052-battery.o

obj-$(CONFIG_CHARGER_DA9150)	+= da9150-charger.o

obj-$(CONFIG_BATTERY_DA9150)	+= da9150-fg.o

obj-$(CONFIG_BATTERY_MAX17040)	+= max17040_battery.o

obj-$(CONFIG_BATTERY_MAX17042)	+= max17042_battery.o

obj-$(CONFIG_BATTERY_MAX1721X)	+= max1721x_battery.o

obj-$(CONFIG_BATTERY_Z2)	+= z2_battery.o

obj-$(CONFIG_BATTERY_RT5033)	+= rt5033_battery.o

obj-$(CONFIG_CHARGER_RT9455)	+= rt9455_charger.o