Commit 4d1483a9 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'regulator-fix-v6.2-rc5' of...

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
parents 0acffb23 4bb3d82a
...@@ -19,8 +19,8 @@ description: | ...@@ -19,8 +19,8 @@ description: |
additional information and example. additional information and example.
patternProperties: patternProperties:
# 25 LDOs # 25 LDOs, without LDO10-12
"^LDO([1-9]|[1][0-9]|2[0-5])$": "^LDO([1-9]|1[3-9]|2[0-5])$":
type: object type: object
$ref: regulator.yaml# $ref: regulator.yaml#
unevaluatedProperties: false unevaluatedProperties: false
...@@ -30,6 +30,23 @@ patternProperties: ...@@ -30,6 +30,23 @@ patternProperties:
required: required:
- regulator-name - regulator-name
"^LDO(1[0-2])$":
type: object
$ref: regulator.yaml#
unevaluatedProperties: false
description:
Properties for single LDO regulator.
properties:
samsung,ext-control-gpios:
maxItems: 1
description:
LDO10, LDO11 and LDO12 can be configured to external control over
GPIO.
required:
- regulator-name
# 5 bucks # 5 bucks
"^BUCK[1-5]$": "^BUCK[1-5]$":
type: object type: object
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment