Skip to content

Commit 4d1483a

Browse files
committed
Merge tag 'regulator-fix-v6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fix from Mark Brown: "A fix for the DT binding documentation which dropped a property when being converted to YAML format causing spurious errors validating device trees for platforms using the device" * tag 'regulator-fix-v6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: dt-bindings: samsung,s2mps14: add lost samsung,ext-control-gpios
2 parents 0acffb2 + 4bb3d82 commit 4d1483a

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

Documentation/devicetree/bindings/regulator/samsung,s2mps14.yaml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ description: |
1919
additional information and example.
2020
2121
patternProperties:
22-
# 25 LDOs
23-
"^LDO([1-9]|[1][0-9]|2[0-5])$":
22+
# 25 LDOs, without LDO10-12
23+
"^LDO([1-9]|1[3-9]|2[0-5])$":
2424
type: object
2525
$ref: regulator.yaml#
2626
unevaluatedProperties: false
@@ -30,6 +30,23 @@ patternProperties:
3030
required:
3131
- regulator-name
3232

33+
"^LDO(1[0-2])$":
34+
type: object
35+
$ref: regulator.yaml#
36+
unevaluatedProperties: false
37+
description:
38+
Properties for single LDO regulator.
39+
40+
properties:
41+
samsung,ext-control-gpios:
42+
maxItems: 1
43+
description:
44+
LDO10, LDO11 and LDO12 can be configured to external control over
45+
GPIO.
46+
47+
required:
48+
- regulator-name
49+
3350
# 5 bucks
3451
"^BUCK[1-5]$":
3552
type: object

0 commit comments

Comments
 (0)