Merge tag 'for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel:
"Core:
- Add over-current health state
- Add standard, adaptive and custom charge types
- Add new properties for start/end charge threshold
New Drivers / Hardware:
- UCS1002 Programmable USB Port Power Controller
- Ingenic JZ47xx Battery Fuel Gauge
- AXP20x USB Power: Add AXP813 support
- AT91 poweroff: Add SAM9X60 support
- OLPC battery: Add XO-1.5 and XO-1.75 support
Misc Changes:
- syscon-reboot: support mask property
- AXP288 fuel gauge: Blacklist ACEPC T8/T11. Looks like some vendor
thought it's a good idea to build a desktop system with a fuel
gauge, that slowly "discharges"...
- cpcap-battery: Fix calculation errors
- misc fixes"
* tag 'for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (54 commits)
power: supply: olpc_battery: force the le/be casts
power: supply: ucs1002: Fix build error without CONFIG_REGULATOR
power: supply: ucs1002: Fix wrong return value checking
power: supply: Add driver for Microchip UCS1002
dt-bindings: power: supply: Add bindings for Microchip UCS1002
power: supply: core: Add POWER_SUPPLY_HEALTH_OVERCURRENT constant
power: supply: core: fix clang -Wunsequenced
power: supply: core: Add missing documentation for CHARGE_CONTROL_* properties
power: supply: core: Add CHARGE_CONTROL_{START_THRESHOLD,END_THRESHOLD} properties
power: supply: core: Add Standard, Adaptive, and Custom charge types
power: supply: axp288_fuel_gauge: Add ACEPC T8 and T11 mini PCs to the blacklist
power: supply: bq27xxx_battery: Notify also about status changes
power: supply: olpc_battery: Have the framework register sysfs files for us
power: supply: olpc_battery: Add OLPC XO 1.75 support
power: supply: olpc_battery: Avoid using platform_info
power: supply: olpc_battery: Use devm_power_supply_register()
power: supply: olpc_battery: Move priv data to a struct
power: supply: olpc_battery: Use DT to get battery version
x86/platform/olpc: Use a correct version when making up a battery node
x86/platform/olpc: Trivial code move in DT fixup
...
This commit is contained in:
Linus Torvalds
@@ -84,7 +84,7 @@ SHDWC SAMA5D2-Compatible Shutdown Controller
|
||||
1) shdwc node
|
||||
|
||||
required properties:
|
||||
- compatible: should be "atmel,sama5d2-shdwc".
|
||||
- compatible: should be "atmel,sama5d2-shdwc" or "microchip,sam9x60-shdwc".
|
||||
- reg: should contain registers location and length
|
||||
- clocks: phandle to input clock.
|
||||
- #address-cells: should be one. The cell is the wake-up input index.
|
||||
@@ -96,6 +96,9 @@ optional properties:
|
||||
microseconds. It's usually a board-related property.
|
||||
- atmel,wakeup-rtc-timer: boolean to enable Real-Time Clock wake-up.
|
||||
|
||||
optional microchip,sam9x60-shdwc properties:
|
||||
- atmel,wakeup-rtt-timer: boolean to enable Real-time Timer Wake-up.
|
||||
|
||||
The node contains child nodes for each wake-up input that the platform uses.
|
||||
|
||||
2) input nodes
|
||||
|
||||
@@ -3,13 +3,20 @@ Generic SYSCON mapped register reset driver
|
||||
This is a generic reset driver using syscon to map the reset register.
|
||||
The reset is generally performed with a write to the reset register
|
||||
defined by the register map pointed by syscon reference plus the offset
|
||||
with the mask defined in the reboot node.
|
||||
with the value and mask defined in the reboot node.
|
||||
|
||||
Required properties:
|
||||
- compatible: should contain "syscon-reboot"
|
||||
- regmap: this is phandle to the register map node
|
||||
- offset: offset in the register map for the reboot register (in bytes)
|
||||
- mask: the reset value written to the reboot register (32 bit access)
|
||||
- value: the reset value written to the reboot register (32 bit access)
|
||||
|
||||
Optional properties:
|
||||
- mask: update only the register bits defined by the mask (32 bit)
|
||||
|
||||
Legacy usage:
|
||||
If a node doesn't contain a value property but contains a mask property, the
|
||||
mask property is used as the value.
|
||||
|
||||
Default will be little endian mode, 32 bit access only.
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ Required Properties:
|
||||
-compatible: One of: "x-powers,axp202-usb-power-supply"
|
||||
"x-powers,axp221-usb-power-supply"
|
||||
"x-powers,axp223-usb-power-supply"
|
||||
"x-powers,axp813-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
|
||||
|
||||
@@ -14,13 +14,17 @@ Required properties :
|
||||
usb-cdp (USB charging downstream port)
|
||||
usb-aca (USB accessory charger adapter)
|
||||
|
||||
Optional properties:
|
||||
- charge-status-gpios: GPIO indicating whether a battery is charging.
|
||||
|
||||
Example:
|
||||
|
||||
usb_charger: charger {
|
||||
compatible = "gpio-charger";
|
||||
charger-type = "usb-sdp";
|
||||
gpios = <&gpf0 2 0 0 0>;
|
||||
}
|
||||
gpios = <&gpd 28 GPIO_ACTIVE_LOW>;
|
||||
charge-status-gpios = <&gpc 27 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
battery {
|
||||
power-supplies = <&usb_charger>;
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
* Ingenic JZ47xx battery bindings
|
||||
|
||||
Required properties:
|
||||
|
||||
- compatible: Must be "ingenic,jz4740-battery".
|
||||
- io-channels: phandle and IIO specifier pair to the IIO device.
|
||||
Format described in iio-bindings.txt.
|
||||
- monitored-battery: phandle to a "simple-battery" compatible node.
|
||||
|
||||
The "monitored-battery" property must be a phandle to a node using the format
|
||||
described in battery.txt, with the following properties being required:
|
||||
|
||||
- voltage-min-design-microvolt: Drained battery voltage.
|
||||
- voltage-max-design-microvolt: Fully charged battery voltage.
|
||||
|
||||
Example:
|
||||
|
||||
#include <dt-bindings/iio/adc/ingenic,adc.h>
|
||||
|
||||
simple_battery: battery {
|
||||
compatible = "simple-battery";
|
||||
voltage-min-design-microvolt = <3600000>;
|
||||
voltage-max-design-microvolt = <4200000>;
|
||||
};
|
||||
|
||||
ingenic_battery {
|
||||
compatible = "ingenic,jz4740-battery";
|
||||
io-channels = <&adc INGENIC_ADC_BATTERY>;
|
||||
io-channel-names = "battery";
|
||||
monitored-battery = <&simple_battery>;
|
||||
};
|
||||
@@ -1,14 +1,16 @@
|
||||
ltc3651-charger
|
||||
Analog Devices LT3651 Charger Power Supply bindings: lt3651-charger
|
||||
|
||||
Required properties:
|
||||
- compatible: "lltc,ltc3651-charger"
|
||||
- compatible: Should contain one of the following:
|
||||
* "lltc,ltc3651-charger", (DEPRECATED: Use "lltc,lt3651-charger")
|
||||
* "lltc,lt3651-charger"
|
||||
- lltc,acpr-gpios: Connect to ACPR output. See remark below.
|
||||
|
||||
Optional properties:
|
||||
- lltc,fault-gpios: Connect to FAULT output. See remark below.
|
||||
- lltc,chrg-gpios: Connect to CHRG output. See remark below.
|
||||
|
||||
The ltc3651 outputs are open-drain type and active low. The driver assumes the
|
||||
The lt3651 outputs are open-drain type and active low. The driver assumes the
|
||||
GPIO reports "active" when the output is asserted, so if the pins have been
|
||||
connected directly, the GPIO flags should be set to active low also.
|
||||
|
||||
@@ -20,7 +22,7 @@ attributes to detect changes.
|
||||
Example:
|
||||
|
||||
charger: battery-charger {
|
||||
compatible = "lltc,ltc3651-charger";
|
||||
compatible = "lltc,lt3651-charger";
|
||||
lltc,acpr-gpios = <&gpio0 68 GPIO_ACTIVE_LOW>;
|
||||
lltc,fault-gpios = <&gpio0 64 GPIO_ACTIVE_LOW>;
|
||||
lltc,chrg-gpios = <&gpio0 63 GPIO_ACTIVE_LOW>;
|
||||
@@ -0,0 +1,27 @@
|
||||
Microchip UCS1002 USB Port Power Controller
|
||||
|
||||
Required properties:
|
||||
- compatible : Should be "microchip,ucs1002";
|
||||
- reg : I2C slave address
|
||||
|
||||
Optional properties:
|
||||
- interrupts : A list of interrupts lines present (could be either
|
||||
corresponding to A_DET# pin, ALERT# pin, or both)
|
||||
- interrupt-names : A list of interrupt names. Should contain (if
|
||||
present):
|
||||
- "a_det" for line connected to A_DET# pin
|
||||
- "alert" for line connected to ALERT# pin
|
||||
Both are expected to be IRQ_TYPE_EDGE_BOTH
|
||||
Example:
|
||||
|
||||
&i2c3 {
|
||||
charger@32 {
|
||||
compatible = "microchip,ucs1002";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_ucs1002_pins>;
|
||||
reg = <0x32>;
|
||||
interrupts-extended = <&gpio5 2 IRQ_TYPE_EDGE_BOTH>,
|
||||
<&gpio3 21 IRQ_TYPE_EDGE_BOTH>;
|
||||
interrupt-names = "a_det", "alert";
|
||||
};
|
||||
};
|
||||
@@ -2,4 +2,4 @@ OLPC battery
|
||||
~~~~~~~~~~~~
|
||||
|
||||
Required properties:
|
||||
- compatible : "olpc,xo1-battery"
|
||||
- compatible : "olpc,xo1-battery" or "olpc,xo1.5-battery"
|
||||
|
||||
Reference in New Issue
Block a user