Skip to content

Commit 5a69e9b

Browse files
committed
Merge tag 'for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel: "battery/charger driver changes: - core: - provide function stubs if CONFIG_POWER_SUPPLY=n - reduce loglevel for probe defer info - surface: - new battery and charger drivers for Surface - bq27xxx: - add bq78z100 support - fix current_now/power_avg for newer chips - cw2015: - add CHARGE_NOW support - ab8500: - drop pdata support - convert most DT bindings to YAML - lots of minor fixes and cleanups reset drivers: - ltc2952-poweroff: - make trigger delay configurable from DT - minor fixes and cleanups" * tag 'for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (97 commits) power: supply: cpcap-battery: fix invalid usage of list cursor power: supply: bq256xx: add kerneldoc for structure members power: supply: act8945a: correct kerneldoc power: supply: max17040: remove unneeded double cast power: supply: max17040: handle device_property_read_u8_array() failure power: supply: max14577: remove unneeded variable initialization power: supply: surface-charger: Make symbol 'surface_ac_pm_ops' static power: supply: surface-battery: Make some symbols static power: reset: restart-poweroff: Add missing MODULE_DEVICE_TABLE power: reset: hisi-reboot: add missing MODULE_DEVICE_TABLE power: supply: s3c_adc_battery: fix possible use-after-free in s3c_adc_bat_remove() power: supply: generic-adc-battery: fix possible use-after-free in gab_remove() power: supply: Add AC driver for Surface Aggregator Module power: supply: Add battery driver for Surface Aggregator Module power: supply: bq25980: Move props from battery node power: supply: core: Use true and false for bool variable power: supply: goldfish: Remove the GOLDFISH dependency power: reset: ltc2952: make trigger delay configurable power: supply: cpcap-charger: Simplify bool conversion power: supply: cpcap-charger: Add usleep to cpcap charger to avoid usb plug bounce ...
2 parents a8b5e03 + d0a43c1 commit 5a69e9b

File tree

139 files changed

+4680
-2133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+4680
-2133
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
What: /sys/class/power_supply/<supply_name>/alarm
2+
Date: April 2021
3+
KernelVersion: 5.13
4+
Contact: Maximilian Luz <[email protected]>
5+
Description:
6+
Battery trip point. When the remaining battery capacity crosses this
7+
value in either direction, the system will be notified and if
8+
necessary woken.
9+
10+
Set to zero to clear/disable.
11+
12+
Access: Read, Write
13+
14+
Valid values: In micro-Wh or micro-Ah, depending on the power unit
15+
of the battery

Documentation/devicetree/bindings/power/reset/ltc2952-poweroff.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,17 @@ Optional properties:
1717
chip's trigger line. If this property is not set, the
1818
trigger function is ignored and the chip is kept alive
1919
until an explicit kill signal is received
20+
- trigger-delay-ms The number of milliseconds to wait after trigger line
21+
assertion before executing shut down procedure.
22+
The default is 2500ms.
2023

2124
Example:
2225

2326
ltc2952 {
2427
compatible = "lltc,ltc2952";
2528

2629
trigger-gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
30+
trigger-delay-ms = <2000>;
2731
watchdog-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
2832
kill-gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
2933
};

Documentation/devicetree/bindings/power/supply/ab8500/btemp.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

Documentation/devicetree/bindings/power/supply/ab8500/chargalg.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

Documentation/devicetree/bindings/power/supply/ab8500/charger.txt

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 0 additions & 44 deletions
This file was deleted.
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/power/supply/active-semi,act8945a-charger.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: Active-semi ACT8945A Charger Function
8+
9+
maintainers:
10+
- Sebastian Reichel <[email protected]>
11+
12+
allOf:
13+
- $ref: power-supply.yaml#
14+
15+
properties:
16+
compatible:
17+
const: active-semi,act8945a-charger
18+
19+
interrupts:
20+
maxItems: 1
21+
22+
active-semi,chglev-gpios:
23+
maxItems: 1
24+
description: charge current level GPIO
25+
26+
active-semi,lbo-gpios:
27+
maxItems: 1
28+
description: low battery voltage detect GPIO
29+
30+
active-semi,input-voltage-threshold-microvolt:
31+
description: |
32+
Specifies the charger's input over-voltage threshold value.
33+
Despite the name, specified values are in millivolt (mV).
34+
Defaults to 6.6 V
35+
enum: [ 6600, 7000, 7500, 8000 ]
36+
37+
active-semi,precondition-timeout:
38+
$ref: /schemas/types.yaml#/definitions/uint32
39+
description: |
40+
Specifies the charger's PRECONDITION safety timer setting value in minutes.
41+
If 0, it means to disable this timer.
42+
Defaults to 40 minutes.
43+
enum: [ 0, 40, 60, 80 ]
44+
45+
active-semi,total-timeout:
46+
$ref: /schemas/types.yaml#/definitions/uint32
47+
description: |
48+
Specifies the charger's total safety timer setting value in hours;
49+
If 0, it means to disable this timer;
50+
Defaults to 3 hours.
51+
enum: [ 0, 3, 4, 5 ]
52+
53+
required:
54+
- compatible
55+
- interrupts
56+
- active-semi,chglev-gpios
57+
- active-semi,lbo-gpios
58+
59+
additionalProperties: false
60+
61+
examples:
62+
- |
63+
#include <dt-bindings/gpio/gpio.h>
64+
#include <dt-bindings/interrupt-controller/irq.h>
65+
pmic {
66+
charger {
67+
compatible = "active-semi,act8945a-charger";
68+
interrupt-parent = <&pioA>;
69+
interrupts = <45 IRQ_TYPE_LEVEL_LOW>;
70+
active-semi,chglev-gpios = <&pioA 12 GPIO_ACTIVE_HIGH>;
71+
active-semi,lbo-gpios = <&pioA 72 GPIO_ACTIVE_LOW>;
72+
active-semi,input-voltage-threshold-microvolt = <6600>;
73+
active-semi,precondition-timeout = <40>;
74+
active-semi,total-timeout = <3>;
75+
};
76+
};

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 0 additions & 20 deletions
This file was deleted.

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

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)