Skip to content

Commit ad66578

Browse files
committed
Merge tag 'regulator-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown: "This is a very quiet release for regulator, almost all the changes are new drivers but we do also have some improvements for the Rust bindings. - Additional APIs added to the Rust bindings - Support for Maxim MAX77838, NXP PF0900 and PF5300, Richtek RT5133 and SpacemiT P1" * tag 'regulator-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (28 commits) regulator: dt-bindings: qcom,sdm845-refgen-regulator: document more platforms regulator: Fix MAX77838 selection regulator: spacemit: support SpacemiT P1 regulators regulator: max77838: add max77838 regulator driver dt-bindings: regulator: document max77838 pmic rust: regulator: add devm_enable and devm_enable_optional rust: regulator: remove Regulator<Dynamic> regulator: dt-bindings: rpi-panel: Split 7" Raspberry Pi 720x1280 v2 binding regulator: pf530x: Add a driver for the NXP PF5300 Regulator regulator: dt-bindings: nxp,pf530x: Add NXP PF5300/PF5301/PF5302 PMICs regulator: scmi: Use int type to store negative error codes regulator: core: Remove redundant ternary operators rust: regulator: use `to_result` for error handling regulator: consumer.rst: document bulk operations regulator: rt5133: Fix IS_ERR() vs NULL bug in rt5133_validate_vendor_info() regulator: bd718x7: Use kcalloc() instead of kzalloc() regulator: rt5133: Fix spelling mistake "regualtor" -> "regulator" regulator: remove unneeded 'fast_io' parameter in regmap_config regulator: rt5133: Add RT5133 PMIC regulator Support regulator: dt-bindings: Add Richtek RT5133 Support ...
2 parents c252b8c + e609438 commit ad66578

29 files changed

+3354
-278
lines changed

Documentation/devicetree/bindings/mfd/act8945a.txt

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

Documentation/devicetree/bindings/power/supply/active-semi,act8945a-charger.yaml

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

Documentation/devicetree/bindings/regulator/active-semi,act8945a.yaml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,28 +91,41 @@ properties:
9191
maxItems: 1
9292

9393
active-semi,chglev-gpios:
94-
description: CGHLEV GPIO
94+
description: charge current level GPIO
9595
maxItems: 1
9696

9797
active-semi,lbo-gpios:
98-
description: LBO GPIO
98+
description: low battery voltage detect GPIO
9999
maxItems: 1
100100

101101
active-semi,input-voltage-threshold-microvolt:
102-
description: Input voltage threshold
103-
maxItems: 1
102+
description:
103+
Specifies the charger's input over-voltage threshold value. Despite
104+
the name, specified values are in millivolt (mV).
105+
enum: [ 6600, 7000, 7500, 8000 ]
106+
default: 6600
104107

105108
active-semi,precondition-timeout:
106-
description: Precondition timeout
109+
description:
110+
Specifies the charger's PRECONDITION safety timer setting value in
111+
minutes. If 0, it means to disable this timer.
112+
enum: [ 0, 40, 60, 80 ]
113+
default: 40
107114
$ref: /schemas/types.yaml#/definitions/uint32
108115

109116
active-semi,total-timeout:
110-
description: Total timeout
117+
description:
118+
Specifies the charger's total safety timer setting value in hours; If
119+
0, it means to disable this timer;
120+
enum: [ 0, 3, 4, 5 ]
121+
default: 3
111122
$ref: /schemas/types.yaml#/definitions/uint32
112123

113124
required:
114125
- compatible
115126
- interrupts
127+
- active-semi,chglev-gpios
128+
- active-semi,lbo-gpios
116129

117130
additionalProperties: false
118131

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/regulator/maxim,max77838.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Maxim Integrated MAX77838 PMIC
8+
9+
maintainers:
10+
- Ivaylo Ivanov <ivo.ivanov.ivanov1@gmail.com>
11+
12+
properties:
13+
$nodename:
14+
pattern: "pmic@[0-9a-f]{1,2}"
15+
compatible:
16+
enum:
17+
- maxim,max77838
18+
19+
reg:
20+
maxItems: 1
21+
22+
regulators:
23+
type: object
24+
$ref: regulator.yaml#
25+
description: |
26+
list of regulators provided by this controller, must be named
27+
after their hardware counterparts ldo[1-4] and buck
28+
29+
properties:
30+
buck:
31+
type: object
32+
$ref: regulator.yaml#
33+
unevaluatedProperties: false
34+
35+
patternProperties:
36+
"^ldo([1-4])$":
37+
type: object
38+
$ref: regulator.yaml#
39+
unevaluatedProperties: false
40+
41+
additionalProperties: false
42+
43+
required:
44+
- compatible
45+
- reg
46+
- regulators
47+
48+
additionalProperties: false
49+
50+
examples:
51+
- |
52+
i2c {
53+
#address-cells = <1>;
54+
#size-cells = <0>;
55+
56+
pmic@60 {
57+
compatible = "maxim,max77838";
58+
reg = <0x60>;
59+
60+
regulators {
61+
ldo2 {
62+
regulator-min-microvolt = <1800000>;
63+
regulator-max-microvolt = <1800000>;
64+
};
65+
};
66+
};
67+
};
68+
...

0 commit comments

Comments
 (0)