Skip to content

Commit 1bcf233

Browse files
committed
Merge branch 'pci/controller/mediatek-gen3'
- Add per-SoC struct mtk_gen3_pcie_pdata to support multiple SoC types (Lorenzo Bianconi) - Use reset_bulk APIs to manage PHY reset lines (Lorenzo Bianconi) - Add DT and driver support for Airoha EN7581 PCIe controller (Lorenzo Bianconi) * pci/controller/mediatek-gen3: PCI: mediatek-gen3: Add Airoha EN7581 support PCI: mediatek-gen3: Rely on reset_bulk APIs for PHY reset lines PCI: mediatek-gen3: Add mtk_gen3_pcie_pdata data structure dt-bindings: PCI: mediatek-gen3: Add support for Airoha EN7581
2 parents 487ce3e + f6ab898 commit 1bcf233

File tree

3 files changed

+229
-21
lines changed

3 files changed

+229
-21
lines changed

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

Lines changed: 63 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ properties:
5353
- mediatek,mt8195-pcie
5454
- const: mediatek,mt8192-pcie
5555
- const: mediatek,mt8192-pcie
56+
- const: airoha,en7581-pcie
5657

5758
reg:
5859
maxItems: 1
@@ -76,20 +77,20 @@ properties:
7677

7778
resets:
7879
minItems: 1
79-
maxItems: 2
80+
maxItems: 3
8081

8182
reset-names:
8283
minItems: 1
83-
maxItems: 2
84+
maxItems: 3
8485
items:
85-
enum: [ phy, mac ]
86+
enum: [ phy, mac, phy-lane0, phy-lane1, phy-lane2 ]
8687

8788
clocks:
88-
minItems: 4
89+
minItems: 1
8990
maxItems: 6
9091

9192
clock-names:
92-
minItems: 4
93+
minItems: 1
9394
maxItems: 6
9495

9596
assigned-clocks:
@@ -147,6 +148,9 @@ allOf:
147148
const: mediatek,mt8192-pcie
148149
then:
149150
properties:
151+
clocks:
152+
minItems: 4
153+
150154
clock-names:
151155
items:
152156
- const: pl_250m
@@ -155,6 +159,15 @@ allOf:
155159
- const: tl_32k
156160
- const: peri_26m
157161
- const: top_133m
162+
163+
resets:
164+
minItems: 1
165+
maxItems: 2
166+
167+
reset-names:
168+
minItems: 1
169+
maxItems: 2
170+
158171
- if:
159172
properties:
160173
compatible:
@@ -164,6 +177,9 @@ allOf:
164177
- mediatek,mt8195-pcie
165178
then:
166179
properties:
180+
clocks:
181+
minItems: 4
182+
167183
clock-names:
168184
items:
169185
- const: pl_250m
@@ -172,6 +188,15 @@ allOf:
172188
- const: tl_32k
173189
- const: peri_26m
174190
- const: peri_mem
191+
192+
resets:
193+
minItems: 1
194+
maxItems: 2
195+
196+
reset-names:
197+
minItems: 1
198+
maxItems: 2
199+
175200
- if:
176201
properties:
177202
compatible:
@@ -180,13 +205,46 @@ allOf:
180205
- mediatek,mt7986-pcie
181206
then:
182207
properties:
208+
clocks:
209+
minItems: 4
210+
183211
clock-names:
184212
items:
185213
- const: pl_250m
186214
- const: tl_26m
187215
- const: peri_26m
188216
- const: top_133m
189217

218+
resets:
219+
minItems: 1
220+
maxItems: 2
221+
222+
reset-names:
223+
minItems: 1
224+
maxItems: 2
225+
226+
- if:
227+
properties:
228+
compatible:
229+
const: airoha,en7581-pcie
230+
then:
231+
properties:
232+
clocks:
233+
maxItems: 1
234+
235+
clock-names:
236+
items:
237+
- const: sys-ck
238+
239+
resets:
240+
minItems: 3
241+
242+
reset-names:
243+
items:
244+
- const: phy-lane0
245+
- const: phy-lane1
246+
- const: phy-lane2
247+
190248
unevaluatedProperties: false
191249

192250
examples:

drivers/pci/controller/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ config PCIE_MEDIATEK
196196

197197
config PCIE_MEDIATEK_GEN3
198198
tristate "MediaTek Gen3 PCIe controller"
199-
depends on ARCH_MEDIATEK || COMPILE_TEST
199+
depends on ARCH_AIROHA || ARCH_MEDIATEK || COMPILE_TEST
200200
depends on PCI_MSI
201201
help
202202
Adds support for PCIe Gen3 MAC controller for MediaTek SoCs.

0 commit comments

Comments
 (0)