Skip to content

Commit 3de810a

Browse files
committed
Merge branch 'remotes/lorenzo/pci/dt'
- Add MT8188 and MT8195 to mediatek-gen3 DT binding (Jianjun Wang) - Add 'clock-names' back to fu740 DT binding (Conor Dooley) - Add 'clocks', 'clock-names', 'dma-ranges' to microchip DT binding (Conor Dooley) - Add 'aggre0' and 'aggre1' clocks to qcom DT binding (Krishna chaitanya chundru) * remotes/lorenzo/pci/dt: dt-bindings: pci: QCOM Add missing sc7280 aggre0, aggre1 clocks dt-bindings: PCI: microchip,pcie-host: fix missing dma-ranges dt-bindings: PCI: microchip,pcie-host: fix missing clocks properties dt-bindings: PCI: fu740-pci: fix missing clock-names dt-bindings: PCI: mediatek-gen3: Add support for MT8188 and MT8195
2 parents 84aabff + 1abbe04 commit 3de810a

File tree

4 files changed

+56
-6
lines changed

4 files changed

+56
-6
lines changed

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,13 @@ allOf:
4848

4949
properties:
5050
compatible:
51-
const: mediatek,mt8192-pcie
51+
oneOf:
52+
- items:
53+
- enum:
54+
- mediatek,mt8188-pcie
55+
- mediatek,mt8195-pcie
56+
- const: mediatek,mt8192-pcie
57+
- const: mediatek,mt8192-pcie
5258

5359
reg:
5460
maxItems: 1
@@ -84,7 +90,9 @@ properties:
8490
- const: tl_96m
8591
- const: tl_32k
8692
- const: peri_26m
87-
- const: top_133m
93+
- enum:
94+
- top_133m # for MT8192
95+
- peri_mem # for MT8188/MT8195
8896

8997
assigned-clocks:
9098
maxItems: 1
@@ -126,6 +134,7 @@ required:
126134
- interrupts
127135
- ranges
128136
- clocks
137+
- clock-names
129138
- '#interrupt-cells'
130139
- interrupt-controller
131140

Documentation/devicetree/bindings/pci/microchip,pcie-host.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,33 @@ properties:
2525
- const: cfg
2626
- const: apb
2727

28+
clocks:
29+
description:
30+
Fabric Interface Controllers, FICs, are the interface between the FPGA
31+
fabric and the core complex on PolarFire SoC. The FICs require two clocks,
32+
one from each side of the interface. The "FIC clocks" described by this
33+
property are on the core complex side & communication through a FIC is not
34+
possible unless it's corresponding clock is enabled. A clock must be
35+
enabled for each of the interfaces the root port is connected through.
36+
This could in theory be all 4 interfaces, one interface or any combination
37+
in between.
38+
minItems: 1
39+
items:
40+
- description: FIC0's clock
41+
- description: FIC1's clock
42+
- description: FIC2's clock
43+
- description: FIC3's clock
44+
45+
clock-names:
46+
description:
47+
As any FIC connection combination is possible, the names should match the
48+
order in the clocks property and take the form "ficN" where N is a number
49+
0-3
50+
minItems: 1
51+
maxItems: 4
52+
items:
53+
pattern: '^fic[0-3]$'
54+
2855
interrupts:
2956
minItems: 1
3057
items:
@@ -40,6 +67,10 @@ properties:
4067
ranges:
4168
maxItems: 1
4269

70+
dma-ranges:
71+
minItems: 1
72+
maxItems: 6
73+
4374
msi-controller:
4475
description: Identifies the node as an MSI controller.
4576

Documentation/devicetree/bindings/pci/qcom,pcie.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ properties:
5454
# Platform constraints are described later.
5555
clocks:
5656
minItems: 3
57-
maxItems: 12
57+
maxItems: 13
5858

5959
clock-names:
6060
minItems: 3
61-
maxItems: 12
61+
maxItems: 13
6262

6363
resets:
6464
minItems: 1
@@ -424,8 +424,8 @@ allOf:
424424
then:
425425
properties:
426426
clocks:
427-
minItems: 11
428-
maxItems: 11
427+
minItems: 13
428+
maxItems: 13
429429
clock-names:
430430
items:
431431
- const: pipe # PIPE clock
@@ -439,6 +439,8 @@ allOf:
439439
- const: slave_q2a # Slave Q2A clock
440440
- const: tbu # PCIe TBU clock
441441
- const: ddrss_sf_tbu # PCIe SF TBU clock
442+
- const: aggre0 # Aggre NoC PCIe CENTER SF AXI clock
443+
- const: aggre1 # Aggre NoC PCIe1 AXI clock
442444
resets:
443445
maxItems: 1
444446
reset-names:

Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ properties:
5151
description: A phandle to the PCIe power up reset line.
5252
maxItems: 1
5353

54+
clocks:
55+
maxItems: 1
56+
57+
clock-names:
58+
const: pcie_aux
59+
5460
pwren-gpios:
5561
description: Should specify the GPIO for controlling the PCI bus device power on.
5662
maxItems: 1
@@ -66,6 +72,7 @@ required:
6672
- interrupt-map-mask
6773
- interrupt-map
6874
- clocks
75+
- clock-names
6976
- resets
7077
- pwren-gpios
7178
- reset-gpios
@@ -104,6 +111,7 @@ examples:
104111
<0x0 0x0 0x0 0x2 &plic0 58>,
105112
<0x0 0x0 0x0 0x3 &plic0 59>,
106113
<0x0 0x0 0x0 0x4 &plic0 60>;
114+
clock-names = "pcie_aux";
107115
clocks = <&prci FU740_PRCI_CLK_PCIE_AUX>;
108116
resets = <&prci 4>;
109117
pwren-gpios = <&gpio 5 0>;

0 commit comments

Comments
 (0)