Commit 2610bd72 authored by Kunihiko Hayashi's avatar Kunihiko Hayashi Committed by David S. Miller
Browse files

dt-bindings: net: ave: 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>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 73b193f2

Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml

+38 −17
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ description: | 
  This describes the devicetree bindings for AVE ethernet controller

  implemented on Socionext UniPhier SoCs.



allOf:

  - $ref: ethernet-controller.yaml#



properties:

  compatible:

    enum:
@@ -44,25 +41,13 @@ properties: 
    minItems: 1

    maxItems: 4



  clock-names:

    oneOf:

      - items:          # for Pro4

          - const: gio

          - const: ether

          - const: ether-gb

          - const: ether-phy

      - const: ether    # for others

  clock-names: true



  resets:

    minItems: 1

    maxItems: 2



  reset-names:

    oneOf:

      - items:          # for Pro4

          - const: gio

          - const: ether

      - const: ether    # for others

  reset-names: true



  socionext,syscon-phy-mode:

    $ref: /schemas/types.yaml#/definitions/phandle-array
@@ -78,6 +63,42 @@ properties: 
    $ref: mdio.yaml#

    unevaluatedProperties: false



allOf:

  - $ref: ethernet-controller.yaml#

  - if:

      properties:

        compatible:

          contains:

            const: socionext,uniphier-pro4-ave4

    then:

      properties:

        clocks:

          minItems: 4

          maxItems: 4

        clock-names:

          items:

            - const: gio

            - const: ether

            - const: ether-gb

            - const: ether-phy

        resets:

          minItems: 2

          maxItems: 2

        reset-names:

          items:

            - const: gio

            - const: ether

    else:

      properties:

        clocks:

          maxItems: 1

        clock-names:

          const: ether

        resets:

          maxItems: 1

        reset-names:

          const: ether



required:

  - compatible

  - reg