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

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

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

+19 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ description: | 
  additional information and example.



patternProperties:

  # 25 LDOs

  "^LDO([1-9]|[1][0-9]|2[0-5])$":

  # 25 LDOs, without LDO10-12

  "^LDO([1-9]|1[3-9]|2[0-5])$":

    type: object

    $ref: regulator.yaml#

    unevaluatedProperties: false
@@ -30,6 +30,23 @@ patternProperties: 
    required:

      - 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

  "^BUCK[1-5]$":

    type: object