Skip to content

Commit b220f31

Browse files
committed
Merge tag 'for-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel: - bq25890: add charge voltage/current support - bd99954: convert to linear range - convert all i2c drivers to use probe_new - misc fixes and cleanups * tag 'for-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (51 commits) power: supply: fix null pointer dereferencing in power_supply_get_battery_info power: supply: bq25890: Fix usb-notifier probe and remove races power: supply: bq25890: Ensure pump_express_work is cancelled on remove power: supply: Fix refcount leak in rk817_charger_probe power: supply: bq25890: Only use pdata->regulator_init_data for vbus power: supply: ab8500: Fix error handling in ab8500_charger_init() power: supply: cw2015: Fix potential null-ptr-deref in cw_bat_probe() power: supply: z2_battery: Fix possible memleak in z2_batt_probe() power: supply: z2_battery: Convert to i2c's .probe_new() power: supply: ucs1002: Convert to i2c's .probe_new() power: supply: smb347: Convert to i2c's .probe_new() power: supply: sbs-manager: Convert to i2c's .probe_new() power: supply: sbs: Convert to i2c's .probe_new() power: supply: rt9455: Convert to i2c's .probe_new() power: supply: rt5033_battery: Convert to i2c's .probe_new() power: supply: max17042_battery: Convert to i2c's .probe_new() power: supply: max17040: Convert to i2c's .probe_new() power: supply: max14656: Convert to i2c's .probe_new() power: supply: ltc4162-l: Convert to i2c's .probe_new() power: supply: ltc2941: Convert to i2c's .probe_new() ...
2 parents b611996 + 104bb8a commit b220f31

Some content is hidden

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

43 files changed

+372
-285
lines changed

Documentation/devicetree/bindings/mfd/ene-kb930.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ description: |
1313
maintainers:
1414
- Dmitry Osipenko <[email protected]>
1515

16+
$ref: /schemas/power/supply/power-supply.yaml
17+
1618
properties:
1719
compatible:
1820
items:
@@ -22,15 +24,13 @@ properties:
2224
reg:
2325
maxItems: 1
2426

25-
monitored-battery: true
26-
power-supplies: true
2727
system-power-controller: true
2828

2929
required:
3030
- compatible
3131
- reg
3232

33-
additionalProperties: false
33+
unevaluatedProperties: false
3434

3535
examples:
3636
- |

Documentation/devicetree/bindings/mfd/rockchip,rk817.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ properties:
124124
The child node for the charger to hold additional properties. If a
125125
battery is not in use, this node can be omitted.
126126
type: object
127+
$ref: /schemas/power/supply/power-supply.yaml
128+
127129
properties:
128130
monitored-battery:
129131
description: |

Documentation/devicetree/bindings/power/reset/gpio-restart.yaml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ description: >
2525
inactive-delay, the GPIO is driven active again. After a delay specified by wait-delay, the
2626
restart handler completes allowing other restart handlers to be attempted.
2727
28+
allOf:
29+
- $ref: restart-handler.yaml#
30+
2831
properties:
2932
compatible:
3033
const: gpio-restart
@@ -41,16 +44,6 @@ properties:
4144
in its inactive state.
4245

4346
priority:
44-
$ref: /schemas/types.yaml#/definitions/uint32
45-
description: |
46-
A priority ranging from 0 to 255 (default 129) according to the following guidelines:
47-
48-
0: Restart handler of last resort, with limited restart capabilities.
49-
128: Default restart handler; use if no other restart handler is expected to be available,
50-
and/or if restart functionality is sufficient to restart the entire system.
51-
255: Highest priority restart handler, will preempt all other restart handlers.
52-
minimum: 0
53-
maximum: 255
5447
default: 129
5548

5649
active-delay:
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# SPDX-License-Identifier: GPL-2.0-only or BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/power/reset/restart-handler.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Restart and shutdown handler generic binding
8+
9+
maintainers:
10+
- Sebastian Reichel <[email protected]>
11+
12+
description:
13+
Restart and shutdown handler device is responsible for powering off the
14+
system, e.g. my cutting off the power. System might have several restart
15+
handlers, which usually are tried from most precise to last resort.
16+
17+
properties:
18+
priority:
19+
$ref: /schemas/types.yaml#/definitions/uint32
20+
description: |
21+
A priority ranging from 0 to 255 according to the following guidelines::
22+
0:: Restart handler of last resort, with limited restart capabilities.
23+
128:: Typical, default restart handler; use if no other restart handler
24+
is expected to be available, and/or if restart functionality is
25+
sufficient to restart the entire system.
26+
255:: Highest priority restart handler, will preempt all other restart handlers.
27+
minimum: 0
28+
maximum: 255
29+
30+
additionalProperties: true

Documentation/devicetree/bindings/power/supply/bq25890.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,15 @@ allOf:
1515

1616
properties:
1717
compatible:
18-
enum:
19-
- ti,bq25890
20-
- ti,bq25892
21-
- ti,bq25895
22-
- ti,bq25896
18+
oneOf:
19+
- enum:
20+
- ti,bq25890
21+
- items:
22+
- enum:
23+
- ti,bq25892
24+
- ti,bq25895
25+
- ti,bq25896
26+
- const: ti,bq25890
2327

2428
reg:
2529
maxItems: 1
@@ -93,7 +97,7 @@ required:
9397
- ti,boost-voltage
9498
- ti,boost-max-current
9599

96-
additionalProperties: false
100+
unevaluatedProperties: false
97101

98102
examples:
99103
- |

Documentation/devicetree/bindings/power/supply/bq27xxx.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,11 @@ properties:
6060

6161
monitored-battery:
6262
description: |
63-
phandle of battery characteristics node.
6463
The fuel gauge uses the following battery properties:
6564
- energy-full-design-microwatt-hours
6665
- charge-full-design-microamp-hours
6766
- voltage-min-design-microvolt
6867
Both or neither of the *-full-design-*-hours properties must be set.
69-
See Documentation/devicetree/bindings/power/supply/battery.yaml
7068
7169
power-supplies: true
7270

Documentation/devicetree/bindings/power/supply/ingenic,battery.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ title: Ingenic JZ47xx battery bindings
1010
maintainers:
1111
- Artur Rojek <[email protected]>
1212

13+
$ref: power-supply.yaml#
14+
1315
properties:
1416
compatible:
1517
oneOf:
@@ -28,8 +30,6 @@ properties:
2830

2931
monitored-battery:
3032
description: >
31-
phandle to a "simple-battery" compatible node.
32-
3333
This property must be a phandle to a node using the format described
3434
in battery.yaml, with the following properties being required:
3535
- voltage-min-design-microvolt: drained battery voltage,

Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ properties:
5959
Voltage threshold to report battery as over voltage (in mV).
6060
Default is not to report over-voltage events.
6161
62+
power-supplies: true
63+
6264
required:
6365
- compatible
6466
- reg

Documentation/devicetree/bindings/power/supply/power-supply.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,10 @@ properties:
1818
This property is added to a supply in order to list the devices which
1919
supply it power, referenced by their phandles.
2020

21+
monitored-battery:
22+
$ref: /schemas/types.yaml#/definitions/phandle
23+
description:
24+
The battery (with "simple-battery" compatible) being monitored by this
25+
power supply.
26+
2127
additionalProperties: true

Documentation/devicetree/bindings/power/supply/rohm,bd99954.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ description: |
1818
provides a Dual-source Battery Charger, two port BC1.2 detection and a
1919
Battery Monitor.
2020
21+
$ref: power-supply.yaml#
2122

2223
properties:
2324
compatible:

0 commit comments

Comments
 (0)