mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
power supply and reset changes for the v4.11 series
* New drivers - sbs-charger driver - max14656_charger_detector - axp20x_ac_power * New chip/feature support - axp20x_usb_power: add AXP223 support - tps65217: add usb charger support - qcom_smbb: support otg regulator - at91-reset: add samx7 support * Dropped drivers - intel_mid_battery (platform was dropped) * Fixes - at91-poweroff: avoid wearing off LPDDR memory - replace deprecated extcon API - lots of cleanup and style fixes - misc. minor functionality fixes -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE72YNB0Y/i3JqeVQT2O7X88g7+poFAliqc7UACgkQ2O7X88g7 +pqV9g//T96CM/O6qHx5VPOAYrHP9pG+iOXjqMQi0oHqW4ggPMulGCLaD7rKpN9I 2pxEJmw9e+F9VAbaY6yFIldOuv/tIo/6Kpnq0VgzHvJoDsJzCbs70tRd4xyPesGL icrI9HZgWEj8jIcKCoBDWjoMHDJEj5igirzw2Rzx3rRcXvoDSrW097vWQyQOv8uN jmGHAsP/J3KaRZsUc5eHfHnbMd750ZWUjANMWcZwfOBkxyKEsiotXqeZqjy5VXyc EzrAvZ8/jZS2CdwgRZUYzPY+awCJqEqbqOx9jitXpO9zrcnOBeArbZDps2tCQxBB 8Ect4UgdkQ5LdHKYZKu9GkChCSOoJdT9wiXsKBATvk+/y2607dtAcVvuSCP7Ogu/ DWZan2oFIx+F15moPHPGKq8bCjwRGR1xFt0ENNpSEInVEG6q/qjpPx8QQvs5YhI0 4cJrm/ZrrdN61znfGDqm+vFqL2BOjiLpxzvOOg8ouTZ80NcrZl8oiAFargoD+rGG KnhRqeWVSKyC9TB01hh2ThQC8F7UHmhw7A10gcmLEx8xApweR8hYGQYtjCQT9Uqs r3biIyWDmEFgmp1J0iM8VJyNc/qcl8dcCCJb0qqfFhpqDoL+QoHLQo3yqM/1osS6 Bs0OZT3QKkHgsQSuDe/knWSr1wLtk/EAhVAolWfH5LztPPsaSrY= =rRsU -----END PGP SIGNATURE----- Merge tag 'for-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply Pull power supply and reset updates from Sebastian Reichel: "New drivers: - sbs-charger driver - max14656_charger_detector - axp20x_ac_power New chip/feature support" - axp20x_usb_power: add AXP223 support - tps65217: add usb charger support - qcom_smbb: support otg regulator - at91-reset: add samx7 support Dropped drivers: - intel_mid_battery (platform was dropped) Fixes: - at91-poweroff: avoid wearing off LPDDR memory - replace deprecated extcon API - lots of cleanup and style fixes - misc minor functionality fixes" * tag 'for-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (84 commits) power: supply: add AC power supply driver for AXP20X and AXP22X PMICs dt-bindings: power: supply: add AXP20X/AXP22X AC power supply power: supply: axp20x_usb_power: use IIO channels when available power: supply: max14656: Export I2C and OF device ID as module aliases power: supply: bq2415x: check for NULL acpi_id to avoid null pointer dereference power: supply: bq24190_charger: Adjust formatting power: supply: bq24190_charger: Handle fault before status on interrupt power: supply: bq24190_charger: Don't read fault register outside irq_handle_thread() power: supply: bq24190_charger: Call power_supply_changed() for relevant component power: supply: bq24190_charger: Install irq_handler_thread() at end of probe() power: supply: bq24190_charger: Call set_mode_host() on pm_resume() power: supply: bq24190_charger: Fix irq trigger to IRQF_TRIGGER_FALLING power: supply: qcom_smbb: add regulator dependency power: reset: at91-reset: remove leftover platform_device_id power: reset: at91-reset: add samx7 support power: supply: max14656: fix platform_no_drv_owner.cocci warnings power: supply: pcf50633-charger: Compress return logic into one line. power: supply: ab8500_btemp: Compress return logic into one line. power: reset: at91-poweroff: timely shutdown LPDDR memories ARM: at91: define LPDDR types ...
This commit is contained in:
Linus Torvalds
commit
c9b9f207b9
35 changed files with 2274 additions and 1818 deletions
|
|
@ -0,0 +1,22 @@
|
|||
AXP20X and AXP22X PMICs' AC power supply
|
||||
|
||||
Required Properties:
|
||||
- compatible: One of:
|
||||
"x-powers,axp202-ac-power-supply"
|
||||
"x-powers,axp221-ac-power-supply"
|
||||
|
||||
This node is a subnode of the axp20x PMIC.
|
||||
|
||||
The AXP20X can read the current current and voltage supplied by AC by
|
||||
reading ADC channels from the AXP20X ADC.
|
||||
|
||||
The AXP22X is only able to tell if an AC power supply is present and
|
||||
usable.
|
||||
|
||||
Example:
|
||||
|
||||
&axp209 {
|
||||
ac_power_supply: ac-power-supply {
|
||||
compatible = "x-powers,axp202-ac-power-supply";
|
||||
};
|
||||
};
|
||||
|
|
@ -3,6 +3,11 @@ AXP20x USB power supply
|
|||
Required Properties:
|
||||
-compatible: One of: "x-powers,axp202-usb-power-supply"
|
||||
"x-powers,axp221-usb-power-supply"
|
||||
"x-powers,axp223-usb-power-supply"
|
||||
|
||||
The AXP223 PMIC shares most of its behaviour with the AXP221 but has slight
|
||||
variations such as the former being able to set the VBUS power supply max
|
||||
current to 100mA, unlike the latter.
|
||||
|
||||
This node is a subnode of the axp20x PMIC.
|
||||
|
||||
|
|
|
|||
36
Documentation/devicetree/bindings/power/supply/bq27xxx.txt
Normal file
36
Documentation/devicetree/bindings/power/supply/bq27xxx.txt
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
Binding for TI BQ27XXX fuel gauge family
|
||||
|
||||
Required properties:
|
||||
- compatible: Should contain one of the following:
|
||||
* "ti,bq27200" - BQ27200
|
||||
* "ti,bq27210" - BQ27210
|
||||
* "ti,bq27500" - deprecated, use revision specific property below
|
||||
* "ti,bq27510" - deprecated, use revision specific property below
|
||||
* "ti,bq27520" - deprecated, use revision specific property below
|
||||
* "ti,bq27500-1" - BQ27500/1
|
||||
* "ti,bq27510g1" - BQ27510-g1
|
||||
* "ti,bq27510g2" - BQ27510-g2
|
||||
* "ti,bq27510g3" - BQ27510-g3
|
||||
* "ti,bq27520g1" - BQ27520-g1
|
||||
* "ti,bq27520g2" - BQ27520-g2
|
||||
* "ti,bq27520g3" - BQ27520-g3
|
||||
* "ti,bq27520g4" - BQ27520-g4
|
||||
* "ti,bq27530" - BQ27530
|
||||
* "ti,bq27531" - BQ27531
|
||||
* "ti,bq27541" - BQ27541
|
||||
* "ti,bq27542" - BQ27542
|
||||
* "ti,bq27546" - BQ27546
|
||||
* "ti,bq27742" - BQ27742
|
||||
* "ti,bq27545" - BQ27545
|
||||
* "ti,bq27421" - BQ27421
|
||||
* "ti,bq27425" - BQ27425
|
||||
* "ti,bq27441" - BQ27441
|
||||
* "ti,bq27621" - BQ27621
|
||||
- reg: integer, i2c address of the device.
|
||||
|
||||
Example:
|
||||
|
||||
bq27510g3 {
|
||||
compatible = "ti,bq27510g3";
|
||||
reg = <0x55>;
|
||||
};
|
||||
|
|
@ -105,6 +105,22 @@ PROPERTIES
|
|||
regulation must be done externally to fully comply with
|
||||
the JEITA safety guidelines if this flag is set.
|
||||
|
||||
- usb_otg_in-supply:
|
||||
Usage: optional
|
||||
Value type: <phandle>
|
||||
Description: Reference to the regulator supplying power to the USB_OTG_IN
|
||||
pin.
|
||||
|
||||
child nodes:
|
||||
- otg-vbus:
|
||||
Usage: optional
|
||||
Description: This node defines a regulator used to control the direction
|
||||
of VBUS voltage - specifically: whether to supply voltage
|
||||
to VBUS for host mode operation of the OTG port, or allow
|
||||
input voltage from external VBUS for charging. In the
|
||||
hardware, the supply for this regulator comes from
|
||||
usb_otg_in-supply.
|
||||
|
||||
EXAMPLE
|
||||
charger@1000 {
|
||||
compatible = "qcom,pm8941-charger";
|
||||
|
|
@ -128,4 +144,7 @@ charger@1000 {
|
|||
|
||||
qcom,fast-charge-current-limit = <1000000>;
|
||||
qcom,dc-charge-current-limit = <1000000>;
|
||||
usb_otg_in-supply = <&pm8941_5vs1>;
|
||||
|
||||
otg-vbus {};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
SBS sbs-charger
|
||||
~~~~~~~~~~
|
||||
|
||||
Required properties:
|
||||
- compatible: "<vendor>,<part-number>", "sbs,sbs-charger" as fallback. The part
|
||||
number compatible string might be used in order to take care of vendor
|
||||
specific registers.
|
||||
|
||||
Optional properties:
|
||||
- interrupt-parent: Should be the phandle for the interrupt controller. Use in
|
||||
conjunction with "interrupts".
|
||||
- interrupts: Interrupt mapping for GPIO IRQ. Use in conjunction with
|
||||
"interrupt-parent". If an interrupt is not provided the driver will switch
|
||||
automatically to polling.
|
||||
|
||||
Example:
|
||||
|
||||
ltc4100@9 {
|
||||
compatible = "lltc,ltc4100", "sbs,sbs-charger";
|
||||
reg = <0x9>;
|
||||
interrupt-parent = <&gpio6>;
|
||||
interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
|
||||
};
|
||||
|
|
@ -8,8 +8,10 @@ Optional properties :
|
|||
- interrupts : Specify the interrupt to be used to trigger when the AC
|
||||
adapter is either plugged in or removed.
|
||||
- ti,ac-detect-gpios : This GPIO is optionally used to read the AC adapter
|
||||
presence. This is a Host GPIO that is configured as an input and
|
||||
connected to the bq24735.
|
||||
status. This is a Host GPIO that is configured as an input and connected
|
||||
to the ACOK pin on the bq24735. Note: for backwards compatibility reasons,
|
||||
the GPIO must be active on AC adapter absence despite ACOK being active
|
||||
(high) on AC adapter presence.
|
||||
- ti,charge-current : Used to control and set the charging current. This value
|
||||
must be between 128mA and 8.128A with a 64mA step resolution. The POR value
|
||||
is 0x0000h. This number is in mA (e.g. 8192), see spec for more information
|
||||
|
|
@ -25,6 +27,8 @@ Optional properties :
|
|||
- 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.
|
||||
- poll-interval : In case 'interrupts' is not specified, poll AC adapter
|
||||
presence with this interval (milliseconds).
|
||||
|
||||
Example:
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
Maxim MAX14656 / AL32 USB Charger Detector
|
||||
|
||||
Required properties :
|
||||
- compatible : "maxim,max14656";
|
||||
- reg: i2c slave address
|
||||
- interrupt-parent: the phandle for the interrupt controller
|
||||
- interrupts: interrupt line
|
||||
|
||||
Example:
|
||||
|
||||
&i2c2 {
|
||||
clock-frequency = <50000>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_i2c2>;
|
||||
status = "okay";
|
||||
|
||||
max14656@35 {
|
||||
compatible = "maxim,max14656";
|
||||
reg = <0x35>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_charger_detect>;
|
||||
interrupt-parent = <&gpio6>;
|
||||
interrupts = <26 IRQ_TYPE_LEVEL_HIGH>;
|
||||
};
|
||||
};
|
||||
Loading…
Reference in a new issue