Commit 69ed52be authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/uniphier' 

- Clean up uniphier-ep reg, clocks, resets, and their names (Kunihiko
  Hayashi)

* pci/controller/uniphier:
  dt-bindings: PCI: uniphier-ep: Clean up reg, clocks, resets, and their names
parents 0784d32c 6f5e55df

Documentation/devicetree/bindings/pci/socionext,uniphier-pcie-ep.yaml

+49 −27
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ description: | 
maintainers:

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



allOf:

  - $ref: /schemas/pci/snps,dw-pcie-ep.yaml#



properties:

  compatible:

    enum:
@@ -29,13 +26,8 @@ properties: 
    maxItems: 5



  reg-names:

    oneOf:

      - items:

          - const: dbi

          - const: dbi2

          - const: link

          - const: addr_space

      - items:

    minItems: 4

    items:

      - const: dbi

      - const: dbi2

      - const: link
@@ -46,23 +38,13 @@ properties: 
    minItems: 1

    maxItems: 2



  clock-names:

    oneOf:

      - items:              # for Pro5

          - const: gio

          - const: link

      - const: link         # for NX1

  clock-names: true



  resets:

    minItems: 1

    maxItems: 2



  reset-names:

    oneOf:

      - items:              # for Pro5

          - const: gio

          - const: link

      - const: link         # for NX1

  reset-names: true



  num-ib-windows:

    const: 16
@@ -78,6 +60,46 @@ properties: 
  phy-names:

    const: pcie-phy



allOf:

  - $ref: /schemas/pci/snps,dw-pcie-ep.yaml#

  - if:

      properties:

        compatible:

          contains:

            const: socionext,uniphier-pro5-pcie-ep

    then:

      properties:

        reg:

          maxItems: 4

        reg-names:

          maxItems: 4

        clocks:

          minItems: 2

        clock-names:

          items:

            - const: gio

            - const: link

        resets:

          minItems: 2

        reset-names:

          items:

            - const: gio

            - const: link

    else:

      properties:

        reg:

          minItems: 5

        reg-names:

          minItems: 5

        clocks:

          maxItems: 1

        clock-names:

          const: link

        resets:

          maxItems: 1

        reset-names:

          const: link



required:

  - compatible

  - reg