Unverified Commit 2eacc847 authored by Kunihiko Hayashi's avatar Kunihiko Hayashi Committed by Mark Brown
Browse files

regulator: uniphier: Clean up clocks, resets, and their names using compatible string 



Instead of "oneOf:" choices, use "allOf:" and "if:" to define clocks,
resets, and their names that can be taken by the compatible string.

The order of clock-names and reset-names doesn't change here.

Signed-off-by: default avatarKunihiko Hayashi <hayashi.kunihiko@socionext.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/1649145303-30221-2-git-send-email-hayashi.kunihiko@socionext.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 266d57dd

Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml

+38 −17
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ description: | 
maintainers:

  - Kunihiko Hayashi <hayashi.kunihiko@socionext.com>



allOf:

  - $ref: "regulator.yaml#"



# USB3 Controller



properties:
@@ -36,25 +33,49 @@ properties: 
    minItems: 1

    maxItems: 2



  clock-names:

    oneOf:

      - items:          # for Pro4, Pro5

          - const: gio

          - const: link

      - items:          # for others

          - const: link

  clock-names: true



  resets:

    minItems: 1

    maxItems: 2



  reset-names:

    oneOf:

      - items:          # for Pro4, Pro5

  reset-names: true



allOf:

  - $ref: "regulator.yaml#"

  - if:

      properties:

        compatible:

          contains:

            enum:

              - socionext,uniphier-pro4-usb3-regulator

              - socionext,uniphier-pro5-usb3-regulator

    then:

      properties:

        clocks:

          minItems: 2

          maxItems: 2

        clock-names:

          items:

            - const: gio

            - const: link

      - items:

        resets:

          minItems: 2

          maxItems: 2

        reset-names:

          items:

            - const: gio

            - const: link

    else:

      properties:

        clocks:

          maxItems: 1

        clock-names:

          const: link

        resets:

          maxItems: 1

        reset-names:

          const: link



additionalProperties: false