Skip to content

Commit 9946bbb

Browse files
committed
Merge branch 'pci/dt-bindings'
- Increase qcom iommu-map maxItems to accommodate SDX55 (five entries) and SDM845 (sixteen entries) (Krzysztof Kozlowski) - Describe qcom,pcie-sc8180x clocks and resets accurately (Krzysztof Kozlowski) - Describe qcom,pcie-sm8150 clocks and resets accurately (Krzysztof Kozlowski) - Correct the qcom "reset-name" property, previously incorrectly called "reset-names" (Krzysztof Kozlowski) - Document rockchip optional PCIe reference clock input (Heiko Stuebner) - Document qcom,pcie-sm8650, based on qcom,pcie-sm8550 (Neil Armstrong) * pci/dt-bindings: dt-bindings: PCI: qcom: Document the SM8650 PCIe Controller dt-bindings: PCI: dwc: rockchip: Document optional PCIe reference clock input dt-bindings: PCI: qcom: Correct reset-names property dt-bindings: PCI: qcom: Correct clocks for SM8150 dt-bindings: PCI: qcom: Correct clocks for SC8180x dt-bindings: PCI: qcom: Adjust iommu-map for different SoC
2 parents eddcaef + 41f7577 commit 9946bbb

File tree

2 files changed

+62
-3
lines changed

2 files changed

+62
-3
lines changed

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

Lines changed: 60 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ properties:
4141
- qcom,pcie-sm8450-pcie0
4242
- qcom,pcie-sm8450-pcie1
4343
- qcom,pcie-sm8550
44+
- items:
45+
- enum:
46+
- qcom,pcie-sm8650
47+
- const: qcom,pcie-sm8550
4448
- items:
4549
- const: qcom,pcie-msm8998
4650
- const: qcom,pcie-msm8996
@@ -62,7 +66,8 @@ properties:
6266
maxItems: 8
6367

6468
iommu-map:
65-
maxItems: 2
69+
minItems: 1
70+
maxItems: 16
6671

6772
# Common definitions for clocks, clock-names and reset.
6873
# Platform constraints are described later.
@@ -88,7 +93,7 @@ properties:
8893
minItems: 1
8994
maxItems: 12
9095

91-
resets-names:
96+
reset-names:
9297
minItems: 1
9398
maxItems: 12
9499

@@ -478,6 +483,33 @@ allOf:
478483
items:
479484
- const: pci # PCIe core reset
480485

486+
- if:
487+
properties:
488+
compatible:
489+
contains:
490+
enum:
491+
- qcom,pcie-sc8180x
492+
then:
493+
properties:
494+
clocks:
495+
minItems: 8
496+
maxItems: 8
497+
clock-names:
498+
items:
499+
- const: pipe # PIPE clock
500+
- const: aux # Auxiliary clock
501+
- const: cfg # Configuration clock
502+
- const: bus_master # Master AXI clock
503+
- const: bus_slave # Slave AXI clock
504+
- const: slave_q2a # Slave Q2A clock
505+
- const: ref # REFERENCE clock
506+
- const: tbu # PCIe TBU clock
507+
resets:
508+
maxItems: 1
509+
reset-names:
510+
items:
511+
- const: pci # PCIe core reset
512+
481513
- if:
482514
properties:
483515
compatible:
@@ -526,8 +558,33 @@ allOf:
526558
compatible:
527559
contains:
528560
enum:
529-
- qcom,pcie-sc8180x
530561
- qcom,pcie-sm8150
562+
then:
563+
properties:
564+
clocks:
565+
minItems: 8
566+
maxItems: 8
567+
clock-names:
568+
items:
569+
- const: pipe # PIPE clock
570+
- const: aux # Auxiliary clock
571+
- const: cfg # Configuration clock
572+
- const: bus_master # Master AXI clock
573+
- const: bus_slave # Slave AXI clock
574+
- const: slave_q2a # Slave Q2A clock
575+
- const: tbu # PCIe TBU clock
576+
- const: ref # REFERENCE clock
577+
resets:
578+
maxItems: 1
579+
reset-names:
580+
items:
581+
- const: pci # PCIe core reset
582+
583+
- if:
584+
properties:
585+
compatible:
586+
contains:
587+
enum:
531588
- qcom,pcie-sm8250
532589
then:
533590
oneOf:

Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ properties:
4949
- description: APB clock for PCIe
5050
- description: Auxiliary clock for PCIe
5151
- description: PIPE clock
52+
- description: Reference clock for PCIe
5253

5354
clock-names:
5455
minItems: 5
@@ -59,6 +60,7 @@ properties:
5960
- const: pclk
6061
- const: aux
6162
- const: pipe
63+
- const: ref
6264

6365
interrupts:
6466
items:

0 commit comments

Comments
 (0)