Commit 9946bbb3 authored by Bjorn Helgaas's avatar Bjorn Helgaas

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
parents eddcaefa 41f75771
...@@ -41,6 +41,10 @@ properties: ...@@ -41,6 +41,10 @@ properties:
- qcom,pcie-sm8450-pcie0 - qcom,pcie-sm8450-pcie0
- qcom,pcie-sm8450-pcie1 - qcom,pcie-sm8450-pcie1
- qcom,pcie-sm8550 - qcom,pcie-sm8550
- items:
- enum:
- qcom,pcie-sm8650
- const: qcom,pcie-sm8550
- items: - items:
- const: qcom,pcie-msm8998 - const: qcom,pcie-msm8998
- const: qcom,pcie-msm8996 - const: qcom,pcie-msm8996
...@@ -62,7 +66,8 @@ properties: ...@@ -62,7 +66,8 @@ properties:
maxItems: 8 maxItems: 8
iommu-map: iommu-map:
maxItems: 2 minItems: 1
maxItems: 16
# Common definitions for clocks, clock-names and reset. # Common definitions for clocks, clock-names and reset.
# Platform constraints are described later. # Platform constraints are described later.
...@@ -88,7 +93,7 @@ properties: ...@@ -88,7 +93,7 @@ properties:
minItems: 1 minItems: 1
maxItems: 12 maxItems: 12
resets-names: reset-names:
minItems: 1 minItems: 1
maxItems: 12 maxItems: 12
...@@ -478,6 +483,33 @@ allOf: ...@@ -478,6 +483,33 @@ allOf:
items: items:
- const: pci # PCIe core reset - const: pci # PCIe core reset
- if:
properties:
compatible:
contains:
enum:
- qcom,pcie-sc8180x
then:
properties:
clocks:
minItems: 8
maxItems: 8
clock-names:
items:
- const: pipe # PIPE clock
- const: aux # Auxiliary clock
- const: cfg # Configuration clock
- const: bus_master # Master AXI clock
- const: bus_slave # Slave AXI clock
- const: slave_q2a # Slave Q2A clock
- const: ref # REFERENCE clock
- const: tbu # PCIe TBU clock
resets:
maxItems: 1
reset-names:
items:
- const: pci # PCIe core reset
- if: - if:
properties: properties:
compatible: compatible:
...@@ -526,8 +558,33 @@ allOf: ...@@ -526,8 +558,33 @@ allOf:
compatible: compatible:
contains: contains:
enum: enum:
- qcom,pcie-sc8180x
- qcom,pcie-sm8150 - qcom,pcie-sm8150
then:
properties:
clocks:
minItems: 8
maxItems: 8
clock-names:
items:
- const: pipe # PIPE clock
- const: aux # Auxiliary clock
- const: cfg # Configuration clock
- const: bus_master # Master AXI clock
- const: bus_slave # Slave AXI clock
- const: slave_q2a # Slave Q2A clock
- const: tbu # PCIe TBU clock
- const: ref # REFERENCE clock
resets:
maxItems: 1
reset-names:
items:
- const: pci # PCIe core reset
- if:
properties:
compatible:
contains:
enum:
- qcom,pcie-sm8250 - qcom,pcie-sm8250
then: then:
oneOf: oneOf:
......
...@@ -49,6 +49,7 @@ properties: ...@@ -49,6 +49,7 @@ properties:
- description: APB clock for PCIe - description: APB clock for PCIe
- description: Auxiliary clock for PCIe - description: Auxiliary clock for PCIe
- description: PIPE clock - description: PIPE clock
- description: Reference clock for PCIe
clock-names: clock-names:
minItems: 5 minItems: 5
...@@ -59,6 +60,7 @@ properties: ...@@ -59,6 +60,7 @@ properties:
- const: pclk - const: pclk
- const: aux - const: aux
- const: pipe - const: pipe
- const: ref
interrupts: interrupts:
items: items:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment