Commit e6936c8d authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/dt' 

- Add ti,j721e-pci-host interrupt controller definition (Matt Ranostay)

- Add ti,j721e-pci-host interrupt properties (Matt Ranostay)

- Add ti,j721s2 host mode device-id (Matt Ranostay)

- Add mediatek-gen3 iommu, power properties (Jianjun Wang)

- Add mediatek-gen3 SoC-based clock names (Frank Wunderlich)

- Add mediatek-gen3 mt7986 support (Frank Wunderlich)

* remotes/lorenzo/pci/dt:
  dt-bindings: PCI: mediatek-gen3: add support for mt7986
  dt-bindings: PCI: mediatek-gen3: add SoC based clock config
  dt-bindings: PCI: Add host mode device-id for j721s2 platform
  dt-bindings: PCI: mediatek-gen3: Support mt8195
  dt-bindings: PCI: ti,j721e-pci-*: Add missing interrupt properties
  dt-bindings: PCI: ti,j721e-pci-host: add interrupt controller definition
parents 0084cd60 d3fd0ee7

Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml

+63 −14
Original line number Diff line number Diff line
@@ -43,14 +43,12 @@ description: |+ 
  each set has its own address for MSI message, and supports 32 MSI vectors

  to generate interrupt.



allOf:

  - $ref: /schemas/pci/pci-bus.yaml#



properties:

  compatible:

    oneOf:

      - items:

          - enum:

              - mediatek,mt7986-pcie

              - mediatek,mt8188-pcie

              - mediatek,mt8195-pcie

          - const: mediatek,mt8192-pcie
@@ -70,29 +68,29 @@ properties: 
    minItems: 1

    maxItems: 8



  iommu-map:

    maxItems: 1



  iommu-map-mask:

    const: 0



  resets:

    minItems: 1

    maxItems: 2



  reset-names:

    minItems: 1

    maxItems: 2

    items:

      - const: phy

      - const: mac

      enum: [ phy, mac ]



  clocks:

    minItems: 4

    maxItems: 6



  clock-names:

    items:

      - const: pl_250m

      - const: tl_26m

      - const: tl_96m

      - const: tl_32k

      - const: peri_26m

      - enum:

          - top_133m        # for MT8192

          - peri_mem        # for MT8188/MT8195

    minItems: 4

    maxItems: 6



  assigned-clocks:

    maxItems: 1
@@ -107,6 +105,9 @@ properties: 
    items:

      - const: pcie-phy



  power-domains:

    maxItems: 1



  '#interrupt-cells':

    const: 1
@@ -138,6 +139,54 @@ required: 
  - '#interrupt-cells'

  - interrupt-controller



allOf:

  - $ref: /schemas/pci/pci-bus.yaml#

  - if:

      properties:

        compatible:

          const: mediatek,mt8192-pcie

    then:

      properties:

        clock-names:

          items:

            - const: pl_250m

            - const: tl_26m

            - const: tl_96m

            - const: tl_32k

            - const: peri_26m

            - const: top_133m

  - if:

      properties:

        compatible:

          contains:

            enum:

              - mediatek,mt8188-pcie

              - mediatek,mt8195-pcie

    then:

      properties:

        clock-names:

          items:

            - const: pl_250m

            - const: tl_26m

            - const: tl_96m

            - const: tl_32k

            - const: peri_26m

            - const: peri_mem

  - if:

      properties:

        compatible:

          contains:

            enum:

              - mediatek,mt7986-pcie

    then:

      properties:

        clock-names:

          items:

            - const: pl_250m

            - const: tl_26m

            - const: peri_26m

            - const: top_133m



unevaluatedProperties: false



examples:

Documentation/devicetree/bindings/pci/ti,j721e-pci-ep.yaml

+7 −0
Original line number Diff line number Diff line
@@ -58,6 +58,13 @@ properties: 
  dma-coherent:

    description: Indicates that the PCIe IP block can ensure the coherency



  interrupts:

    maxItems: 1



  interrupt-names:

    items:

      - const: link_state



required:

  - compatible

  - reg

Documentation/devicetree/bindings/pci/ti,j721e-pci-host.yaml

+22 −0
Original line number Diff line number Diff line
@@ -73,9 +73,31 @@ properties: 
          - const: 0xb00f

      - items:

          - const: 0xb010

      - items:

          - const: 0xb013



  msi-map: true



  interrupts:

    maxItems: 1



  interrupt-names:

    items:

      - const: link_state



  interrupt-controller:

    type: object

    additionalProperties: false



    properties:

      interrupt-controller: true



      '#interrupt-cells':

        const: 1



      interrupts:

        maxItems: 1



required:

  - compatible

  - reg