提交 e6936c8d 编写于 作者: B Bjorn Helgaas

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
...@@ -43,14 +43,12 @@ description: |+ ...@@ -43,14 +43,12 @@ description: |+
each set has its own address for MSI message, and supports 32 MSI vectors each set has its own address for MSI message, and supports 32 MSI vectors
to generate interrupt. to generate interrupt.
allOf:
- $ref: /schemas/pci/pci-bus.yaml#
properties: properties:
compatible: compatible:
oneOf: oneOf:
- items: - items:
- enum: - enum:
- mediatek,mt7986-pcie
- mediatek,mt8188-pcie - mediatek,mt8188-pcie
- mediatek,mt8195-pcie - mediatek,mt8195-pcie
- const: mediatek,mt8192-pcie - const: mediatek,mt8192-pcie
...@@ -70,29 +68,29 @@ properties: ...@@ -70,29 +68,29 @@ properties:
minItems: 1 minItems: 1
maxItems: 8 maxItems: 8
iommu-map:
maxItems: 1
iommu-map-mask:
const: 0
resets: resets:
minItems: 1 minItems: 1
maxItems: 2 maxItems: 2
reset-names: reset-names:
minItems: 1 minItems: 1
maxItems: 2
items: items:
- const: phy enum: [ phy, mac ]
- const: mac
clocks: clocks:
minItems: 4
maxItems: 6 maxItems: 6
clock-names: clock-names:
items: minItems: 4
- const: pl_250m maxItems: 6
- const: tl_26m
- const: tl_96m
- const: tl_32k
- const: peri_26m
- enum:
- top_133m # for MT8192
- peri_mem # for MT8188/MT8195
assigned-clocks: assigned-clocks:
maxItems: 1 maxItems: 1
...@@ -107,6 +105,9 @@ properties: ...@@ -107,6 +105,9 @@ properties:
items: items:
- const: pcie-phy - const: pcie-phy
power-domains:
maxItems: 1
'#interrupt-cells': '#interrupt-cells':
const: 1 const: 1
...@@ -138,6 +139,54 @@ required: ...@@ -138,6 +139,54 @@ required:
- '#interrupt-cells' - '#interrupt-cells'
- interrupt-controller - 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 unevaluatedProperties: false
examples: examples:
......
...@@ -58,6 +58,13 @@ properties: ...@@ -58,6 +58,13 @@ properties:
dma-coherent: dma-coherent:
description: Indicates that the PCIe IP block can ensure the coherency description: Indicates that the PCIe IP block can ensure the coherency
interrupts:
maxItems: 1
interrupt-names:
items:
- const: link_state
required: required:
- compatible - compatible
- reg - reg
......
...@@ -73,9 +73,31 @@ properties: ...@@ -73,9 +73,31 @@ properties:
- const: 0xb00f - const: 0xb00f
- items: - items:
- const: 0xb010 - const: 0xb010
- items:
- const: 0xb013
msi-map: true 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: required:
- compatible - compatible
- reg - reg
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册