Skip to content

Commit 0683141

Browse files
committed
Merge branch 'pci/dt-bindings'
- Update mediatek-gen3 DT binding to require the exact number of clocks for each SoC (Fei Shao) - Add qcom SAR2130P DT binding with an additional clock (Dmitry Baryshkov) * pci/dt-bindings: dt-bindings: PCI: snps,dw-pcie: Drop "#interrupt-cells" from example dt-bindings: PCI: qcom,pcie-sm8550: Add SAR2130P compatible dt-bindings: PCI: mediatek-gen3: Allow exact number of clocks only
2 parents 5cdd50d + 718c157 commit 0683141

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ allOf:
149149
then:
150150
properties:
151151
clocks:
152-
minItems: 4
152+
minItems: 6
153153

154154
clock-names:
155155
items:
@@ -178,7 +178,7 @@ allOf:
178178
then:
179179
properties:
180180
clocks:
181-
minItems: 4
181+
minItems: 6
182182

183183
clock-names:
184184
items:
@@ -207,6 +207,7 @@ allOf:
207207
properties:
208208
clocks:
209209
minItems: 4
210+
maxItems: 4
210211

211212
clock-names:
212213
items:

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ properties:
2020
- const: qcom,pcie-sm8550
2121
- items:
2222
- enum:
23+
- qcom,sar2130p-pcie
2324
- qcom,pcie-sm8650
2425
- const: qcom,pcie-sm8550
2526

@@ -39,7 +40,7 @@ properties:
3940

4041
clocks:
4142
minItems: 7
42-
maxItems: 8
43+
maxItems: 9
4344

4445
clock-names:
4546
minItems: 7
@@ -52,6 +53,7 @@ properties:
5253
- const: ddrss_sf_tbu # PCIe SF TBU clock
5354
- const: noc_aggr # Aggre NoC PCIe AXI clock
5455
- const: cnoc_sf_axi # Config NoC PCIe1 AXI clock
56+
- const: qmip_pcie_ahb # QMIP PCIe AHB clock
5557

5658
interrupts:
5759
minItems: 8

Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ examples:
230230
231231
interrupts = <25>, <24>;
232232
interrupt-names = "msi", "hp";
233-
#interrupt-cells = <1>;
234233
235234
reset-gpios = <&port0 0 1>;
236235

0 commit comments

Comments
 (0)