You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge tag 'for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel: - move power supply drivers to drivers/power/supply - unify location of power supply DT documentation - tps65217-charger: IRQ support - act8945a-charger: misc. cleanups & improvements - sbs-battery cleanup - fix users of deprecated create_singlethread_workqueue() - misc fixes. * tag 'for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (46 commits) power: supply: bq27xxx_battery: allow kernel poll_interval parameter runtime update power: supply: sbs-battery: Cleanup removal of chip->pdata power: reset: st: Remove obsolete platforms from dt doc power: reset: st-poweroff: Remove obsolete platforms. power: reset: zx-reboot: Unmap region obtained by of_iomap power: reset: xgene-reboot: Unmap region obtained by of_iomap power: supply: ab8500: cleanup with list_first_entry_or_null() power: reset: add in missing white space in error message text sbs-battery: make writes to ManufacturerAccess optional power: bq24257: Fix use of uninitialized pointer bq->charger power: supply: sbs-battery: simplify DT parsing power: supply: bq24735-charger: Request status GPIO with initial input setup power: supply: sbs-battery: Use gpio_desc and sleeping calls for battery detect power: supply: act8945a_charger: Add max current property power: supply: act8945a_charger: Add capacity level property doc: bindings: power: act8945a-charger: Update properties. power: supply: act8945a_charger: Fix the power supply type power: supply: act8945a_charger: Add status change update support power: supply: act8945a_charger: Improve state handling power: supply: act8945a_charger: Remove "battery_temperature" ...
This commit is contained in:
@@ -1090,6 +1090,10 @@ S: 6350 Stoneridge Mall Road
|
||||
S: Pleasanton, CA 94588
|
||||
S: USA
|
||||
|
||||
N: Dmitry Eremin-Solenikov
|
||||
E: dbaryshkov@gmail.com
|
||||
D: Power Supply Maintainer from v3.14 - v3.15
|
||||
|
||||
N: Doug Evans
|
||||
E: dje@cygnus.com
|
||||
D: Wrote Xenix FS (part of standard kernel since 0.99.15)
|
||||
|
||||
@@ -22,7 +22,7 @@ Description:
|
||||
What: /sys/class/power_supply/max14577-charger/device/fast_charge_timer
|
||||
Date: October 2014
|
||||
KernelVersion: 3.18.0
|
||||
Contact: Krzysztof Kozlowski <k.kozlowski@samsung.com>
|
||||
Contact: Krzysztof Kozlowski <krzk@kernel.org>
|
||||
Description:
|
||||
This entry shows and sets the maximum time the max14577
|
||||
charger operates in fast-charge mode. When the timer expires
|
||||
@@ -36,7 +36,7 @@ Description:
|
||||
What: /sys/class/power_supply/max77693-charger/device/fast_charge_timer
|
||||
Date: January 2015
|
||||
KernelVersion: 3.19.0
|
||||
Contact: Krzysztof Kozlowski <k.kozlowski@samsung.com>
|
||||
Contact: Krzysztof Kozlowski <krzk@kernel.org>
|
||||
Description:
|
||||
This entry shows and sets the maximum time the max77693
|
||||
charger operates in fast-charge mode. When the timer expires
|
||||
@@ -50,7 +50,7 @@ Description:
|
||||
What: /sys/class/power_supply/max77693-charger/device/top_off_threshold_current
|
||||
Date: January 2015
|
||||
KernelVersion: 3.19.0
|
||||
Contact: Krzysztof Kozlowski <k.kozlowski@samsung.com>
|
||||
Contact: Krzysztof Kozlowski <krzk@kernel.org>
|
||||
Description:
|
||||
This entry shows and sets the charging current threshold for
|
||||
entering top-off charging mode. When charging current in fast
|
||||
@@ -65,7 +65,7 @@ Description:
|
||||
What: /sys/class/power_supply/max77693-charger/device/top_off_timer
|
||||
Date: January 2015
|
||||
KernelVersion: 3.19.0
|
||||
Contact: Krzysztof Kozlowski <k.kozlowski@samsung.com>
|
||||
Contact: Krzysztof Kozlowski <krzk@kernel.org>
|
||||
Description:
|
||||
This entry shows and sets the maximum time the max77693
|
||||
charger operates in top-off charge mode. When the timer expires
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
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>;
|
||||
};
|
||||
@@ -1,11 +1,12 @@
|
||||
*Device-Tree bindings for ST SW reset functionality
|
||||
|
||||
Required properties:
|
||||
- compatible: should be "st,<chip>-restart".
|
||||
- compatible: should be "stih407-restart".
|
||||
- st,syscfg: should be a phandle of the syscfg node.
|
||||
|
||||
Example node:
|
||||
restart {
|
||||
compatible = "st,stih416-restart";
|
||||
st,syscfg = <&syscfg_sbc>;
|
||||
compatible = "st,stih407-restart";
|
||||
st,syscfg = <&syscfg_sbc_reg>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
Device-Tree bindings for charger of Active-semi ACT8945A Multi-Function Device
|
||||
|
||||
Required properties:
|
||||
- compatible: "active-semi,act8945a-charger".
|
||||
- active-semi,chglev-gpios: charge current level phandle with args
|
||||
as described in ../gpio/gpio.txt.
|
||||
- active-semi,lbo-gpios: specify the low battery voltage detect phandle
|
||||
with args as as described in ../gpio/gpio.txt.
|
||||
- interrupts: <a b> where a is the interrupt number and b is a
|
||||
field that represents an encoding of the sense and level
|
||||
information for the interrupt.
|
||||
- interrupt-parent: the phandle for the interrupt controller that
|
||||
services interrupts for this device.
|
||||
|
||||
Optional properties:
|
||||
- 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";
|
||||
|
||||
charger {
|
||||
compatible = "active-semi,act8945a-charger";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_charger_chglev &pinctrl_charger_lbo &pinctrl_charger_irq>;
|
||||
interrupt-parent = <&pioA>;
|
||||
interrupts = <45 GPIO_ACTIVE_LOW>;
|
||||
|
||||
active-semi,chglev-gpios = <&pioA 12 GPIO_ACTIVE_HIGH>;
|
||||
active-semi,lbo-gpios = <&pioA 72 GPIO_ACTIVE_LOW>;
|
||||
active-semi,input-voltage-threshold-microvolt = <6600>;
|
||||
active-semi,precondition-timeout = <40>;
|
||||
active-semi,total-timeout = <3>;
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user