Commit 9cc984e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull power supply and reset changes from Sebastian Reichel:
 - add types for USB Type C and PD chargers
 - add act8945a charger driver
 - add ACPI/DT bindings for goldfish-battery
 - add support for versatile reset controller
 - misc fixes

* tag 'for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (24 commits)
  power: pm2301-charger: use __maybe_unused to hide pm functions
  power: ipaq-micro-battery: use __maybe_unused to hide pm functions
  power_supply: 88pm860x_charger: do not pass NULL to power_supply_put
  jz4740-battery: Correct voltage change check
  power_supply: lp8788-charger: initialize boolean 'found'
  goldfish: Enable ACPI-based enumeration for goldfish battery
  power: goldfish_battery: add devicetree bindings
  power: act8945a: add charger driver for ACT8945A
  power: add documentation for ACT8945A's charger DT bindings
  ARM: dts: n900: Rename isp1704 to isp1707 to match correct name
  power_supply: bq27xxx_battery: Add of modalias and match table when CONFIG_OF is enabled
  power_supply: bq2415x_charger: Add of modalias and match table when CONFIG_OF is enabled
  power_supply: bq2415x_charger: Do not add acpi modalias when CONFIG_ACPI is not enabled
  power_supply: isp1704_charger: Add compatible of match for nxp,isp1707
  power_supply: isp1704_charger: Error messages when probe fail
  power_supply: Add types for USB Type C and PD chargers
  power: bq24735-charger: add 'ti,external-control' option
  power: bq24735-charger: document 'ti,external-control' option
  power: bq24735-charger: fix failed i2c with ac-detect
  power: reset: Fix dependencies for !HAS_IOMEM archs
  ...
parents b5b131c7 0df6e32b

Documentation/devicetree/bindings/goldfish/battery.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Android Goldfish Battery



Android goldfish battery device generated by android emulator.



Required properties:



- compatible : should contain "google,goldfish-battery" to match emulator

- reg        : <registers mapping>

- interrupts : <interrupt mapping>



Example:



	goldfish_battery@9020000 {

		compatible = "google,goldfish-battery";

		reg = <0x9020000 0x1000>;

		interrupts = <0x3>;

	};

Documentation/devicetree/bindings/power/act8945a-charger.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
Device-Tree bindings for charger of Active-semi ACT8945A Multi-Function Device



Required properties:

 - compatible: "active-semi,act8945a", please refer to ../mfd/act8945a.txt.

 - active-semi,chglev-gpios: charge current level phandle with args

   as described in ../gpio/gpio.txt.



Optional properties:

 - active-semi,check-battery-temperature: boolean to check the battery

   temperature or not.

 - active-semi,input-voltage-threshold-microvolt: unit: mV;

   Specifies the charger's input over-voltage threshold value;

   The value can be: 6600, 7000, 7500, 8000; default: 6600

 - active-semi,precondition-timeout: unit: minutes;

   Specifies the charger's PRECONDITION safety timer setting value;

   The value can be: 40, 60, 80, 0; If 0, it means to disable this timer;

   default: 40.

 - active-semi,total-timeout: unit: hours;

   Specifies the charger's total safety timer setting value;

   The value can be: 3, 4, 5, 0; If 0, it means to disable this timer;

   default: 3.



Example:

	pmic@5b {

		compatible = "active-semi,act8945a";

		reg = <0x5b>;

		status = "okay";



		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_charger_chglev>;

		active-semi,chglev-gpios = <&pioA 12 GPIO_ACTIVE_HIGH>;

		active-semi,input-voltage-threshold-microvolt = <6600>;

		active-semi,precondition-timeout = <40>;

		active-semi,total-timeout = <3>;

	};

Documentation/devicetree/bindings/power_supply/ti,bq24735.txt

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ Optional properties : 
   value must be between 128mA and 8.064A with a 128mA step resolution. The

   POR value is 0x1000h. This number is in mA (e.g. 8064), see the spec for

   more information about the InputCurrent (0x3fh) register.

 - ti,external-control : Indicates that the charger is configured externally

   and that the host should not attempt to enable/disable charging or set the

   charge voltage/current.



Example:

arch/arm/boot/dts/omap3-n900.dts

+3 −3
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ 
		};

	};



	isp1704: isp1704 {

		compatible = "nxp,isp1704";

	isp1707: isp1707 {

		compatible = "nxp,isp1707";

		nxp,enable-gpio = <&gpio3 3 GPIO_ACTIVE_HIGH>;

		usb-phy = <&usb2_phy>;

	};
@@ -618,7 +618,7 @@ 
		ti,termination-current = <100>;

		ti,resistor-sense = <68>;



		ti,usb-charger-detection = <&isp1704>;

		ti,usb-charger-detection = <&isp1707>;

	};

};

drivers/power/88pm860x_charger.c

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static irqreturn_t pm860x_temp_handler(int irq, void *data) 


	psy = power_supply_get_by_name(pm860x_supplied_to[0]);

	if (!psy)

		goto out;

		return IRQ_HANDLED;

	ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_TEMP, &temp);

	if (ret)

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE