Skip to content

Commit e6936c8

Browse files
committed
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
2 parents 0084cd6 + d3fd0ee commit e6936c8

File tree

3 files changed

+92
-14
lines changed

3 files changed

+92
-14
lines changed

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

Lines changed: 63 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,12 @@ description: |+
4343
each set has its own address for MSI message, and supports 32 MSI vectors
4444
to generate interrupt.
4545
46-
allOf:
47-
- $ref: /schemas/pci/pci-bus.yaml#
48-
4946
properties:
5047
compatible:
5148
oneOf:
5249
- items:
5350
- enum:
51+
- mediatek,mt7986-pcie
5452
- mediatek,mt8188-pcie
5553
- mediatek,mt8195-pcie
5654
- const: mediatek,mt8192-pcie
@@ -70,29 +68,29 @@ properties:
7068
minItems: 1
7169
maxItems: 8
7270

71+
iommu-map:
72+
maxItems: 1
73+
74+
iommu-map-mask:
75+
const: 0
76+
7377
resets:
7478
minItems: 1
7579
maxItems: 2
7680

7781
reset-names:
7882
minItems: 1
83+
maxItems: 2
7984
items:
80-
- const: phy
81-
- const: mac
85+
enum: [ phy, mac ]
8286

8387
clocks:
88+
minItems: 4
8489
maxItems: 6
8590

8691
clock-names:
87-
items:
88-
- const: pl_250m
89-
- const: tl_26m
90-
- const: tl_96m
91-
- const: tl_32k
92-
- const: peri_26m
93-
- enum:
94-
- top_133m # for MT8192
95-
- peri_mem # for MT8188/MT8195
92+
minItems: 4
93+
maxItems: 6
9694

9795
assigned-clocks:
9896
maxItems: 1
@@ -107,6 +105,9 @@ properties:
107105
items:
108106
- const: pcie-phy
109107

108+
power-domains:
109+
maxItems: 1
110+
110111
'#interrupt-cells':
111112
const: 1
112113

@@ -138,6 +139,54 @@ required:
138139
- '#interrupt-cells'
139140
- interrupt-controller
140141

142+
allOf:
143+
- $ref: /schemas/pci/pci-bus.yaml#
144+
- if:
145+
properties:
146+
compatible:
147+
const: mediatek,mt8192-pcie
148+
then:
149+
properties:
150+
clock-names:
151+
items:
152+
- const: pl_250m
153+
- const: tl_26m
154+
- const: tl_96m
155+
- const: tl_32k
156+
- const: peri_26m
157+
- const: top_133m
158+
- if:
159+
properties:
160+
compatible:
161+
contains:
162+
enum:
163+
- mediatek,mt8188-pcie
164+
- mediatek,mt8195-pcie
165+
then:
166+
properties:
167+
clock-names:
168+
items:
169+
- const: pl_250m
170+
- const: tl_26m
171+
- const: tl_96m
172+
- const: tl_32k
173+
- const: peri_26m
174+
- const: peri_mem
175+
- if:
176+
properties:
177+
compatible:
178+
contains:
179+
enum:
180+
- mediatek,mt7986-pcie
181+
then:
182+
properties:
183+
clock-names:
184+
items:
185+
- const: pl_250m
186+
- const: tl_26m
187+
- const: peri_26m
188+
- const: top_133m
189+
141190
unevaluatedProperties: false
142191

143192
examples:

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@ properties:
5858
dma-coherent:
5959
description: Indicates that the PCIe IP block can ensure the coherency
6060

61+
interrupts:
62+
maxItems: 1
63+
64+
interrupt-names:
65+
items:
66+
- const: link_state
67+
6168
required:
6269
- compatible
6370
- reg

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,31 @@ properties:
7373
- const: 0xb00f
7474
- items:
7575
- const: 0xb010
76+
- items:
77+
- const: 0xb013
7678

7779
msi-map: true
7880

81+
interrupts:
82+
maxItems: 1
83+
84+
interrupt-names:
85+
items:
86+
- const: link_state
87+
88+
interrupt-controller:
89+
type: object
90+
additionalProperties: false
91+
92+
properties:
93+
interrupt-controller: true
94+
95+
'#interrupt-cells':
96+
const: 1
97+
98+
interrupts:
99+
maxItems: 1
100+
79101
required:
80102
- compatible
81103
- reg

0 commit comments

Comments
 (0)