Skip to content

Commit aabf717

Browse files
bjorn-helgaasbjorn-helgaas
committed
Merge branch 'pci/controller/qcom'
- Split dt-binding qcom,pcie.yaml into qcom,pcie-common.yaml and separate files for SA8775p, SC7280, SC8180X, SC8280XP, SM8150, SM8250, SM8350, SM8450, SM8550 for easier reviewing (Krzysztof Kozlowski) - Allow 'required-opps' DT property for SoCs that require a minimum performance level for the power domain (Johan Hovold) - Remove requirement for 'msi-map-mask' DT property since it depends on how MSIs are mapped (Johan Hovold) - Disable ASPM L0s for sc8280xp, sa8540p and sa8295p because their PHY configuration isn't tuned for L0s, which results in many Correctable Errors (Johan Hovold) - Enable BDF to SID translation by disabling bypass mode (Manivannan Sadhasivam) - Add DT binding and driver support for X1E80100 (Abel Vesa) * pci/controller/qcom: PCI: qcom: Add X1E80100 PCIe support dt-bindings: PCI: qcom: Document the X1E80100 PCIe Controller PCI: qcom: Enable BDF to SID translation properly PCI: qcom: Disable ASPM L0s for sc8280xp, sa8540p and sa8295p dt-bindings: PCI: qcom: Do not require 'msi-map-mask' dt-bindings: PCI: qcom: Allow 'required-opps' dt-bindings: PCI: qcom,pcie-sa8775p: Move SA8775p to dedicated schema dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema dt-bindings: PCI: qcom,pcie-sc8180x: Move SC8180X to dedicated schema dt-bindings: PCI: qcom,pcie-sc8280xp: Move SC8280XP to dedicated schema dt-bindings: PCI: qcom,pcie-sm8350: Move SM8350 to dedicated schema dt-bindings: PCI: qcom,pcie-sm8150: Move SM8150 to dedicated schema dt-bindings: PCI: qcom,pcie-sm8250: Move SM8250 to dedicated schema dt-bindings: PCI: qcom,pcie-sm8450: Move SM8450 to dedicated schema dt-bindings: PCI: qcom,pcie-sm8550: Move SM8550 to dedicated schema
2 parents 45b2987 + 6d0c393 commit aabf717

13 files changed

+1854
-377
lines changed

‎Documentation/devicetree/bindings/pci/qcom,pcie-common.yaml

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pci/qcom,pcie-common.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm PCI Express Root Complex Common Properties
8+
9+
maintainers:
10+
- Bjorn Andersson <[email protected]>
11+
- Manivannan Sadhasivam <[email protected]>
12+
13+
properties:
14+
reg:
15+
minItems: 4
16+
maxItems: 6
17+
18+
reg-names:
19+
minItems: 4
20+
maxItems: 6
21+
22+
interrupts:
23+
minItems: 1
24+
maxItems: 8
25+
26+
interrupt-names:
27+
minItems: 1
28+
maxItems: 8
29+
30+
iommu-map:
31+
minItems: 1
32+
maxItems: 16
33+
34+
clocks:
35+
minItems: 3
36+
maxItems: 13
37+
38+
clock-names:
39+
minItems: 3
40+
maxItems: 13
41+
42+
dma-coherent: true
43+
44+
interconnects:
45+
maxItems: 2
46+
47+
interconnect-names:
48+
items:
49+
- const: pcie-mem
50+
- const: cpu-pcie
51+
52+
phys:
53+
maxItems: 1
54+
55+
phy-names:
56+
items:
57+
- const: pciephy
58+
59+
power-domains:
60+
maxItems: 1
61+
62+
required-opps:
63+
maxItems: 1
64+
65+
resets:
66+
minItems: 1
67+
maxItems: 12
68+
69+
reset-names:
70+
minItems: 1
71+
maxItems: 12
72+
73+
perst-gpios:
74+
description: GPIO controlled connection to PERST# signal
75+
maxItems: 1
76+
77+
wake-gpios:
78+
description: GPIO controlled connection to WAKE# signal
79+
maxItems: 1
80+
81+
required:
82+
- reg
83+
- reg-names
84+
- interrupt-map-mask
85+
- interrupt-map
86+
- clocks
87+
- clock-names
88+
89+
anyOf:
90+
- required:
91+
- interrupts
92+
- interrupt-names
93+
- "#interrupt-cells"
94+
- required:
95+
- msi-map
96+
97+
allOf:
98+
- $ref: /schemas/pci/pci-bus.yaml#
99+
100+
additionalProperties: true

‎Documentation/devicetree/bindings/pci/qcom,pcie-sa8775p.yaml

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pci/qcom,pcie-sa8775p.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm SA8775p PCI Express Root Complex
8+
9+
maintainers:
10+
- Bjorn Andersson <[email protected]>
11+
- Manivannan Sadhasivam <[email protected]>
12+
13+
description:
14+
Qualcomm SA8775p SoC PCIe root complex controller is based on the Synopsys
15+
DesignWare PCIe IP.
16+
17+
properties:
18+
compatible:
19+
const: qcom,pcie-sa8775p
20+
21+
reg:
22+
minItems: 6
23+
maxItems: 6
24+
25+
reg-names:
26+
items:
27+
- const: parf # Qualcomm specific registers
28+
- const: dbi # DesignWare PCIe registers
29+
- const: elbi # External local bus interface registers
30+
- const: atu # ATU address space
31+
- const: config # PCIe configuration space
32+
- const: mhi # MHI registers
33+
34+
clocks:
35+
minItems: 5
36+
maxItems: 5
37+
38+
clock-names:
39+
items:
40+
- const: aux # Auxiliary clock
41+
- const: cfg # Configuration clock
42+
- const: bus_master # Master AXI clock
43+
- const: bus_slave # Slave AXI clock
44+
- const: slave_q2a # Slave Q2A clock
45+
46+
interrupts:
47+
minItems: 8
48+
maxItems: 8
49+
50+
interrupt-names:
51+
items:
52+
- const: msi0
53+
- const: msi1
54+
- const: msi2
55+
- const: msi3
56+
- const: msi4
57+
- const: msi5
58+
- const: msi6
59+
- const: msi7
60+
61+
resets:
62+
maxItems: 1
63+
64+
reset-names:
65+
items:
66+
- const: pci
67+
68+
required:
69+
- interconnects
70+
- interconnect-names
71+
72+
allOf:
73+
- $ref: qcom,pcie-common.yaml#
74+
75+
unevaluatedProperties: false
76+
77+
examples:
78+
- |
79+
#include <dt-bindings/clock/qcom,sa8775p-gcc.h>
80+
#include <dt-bindings/clock/qcom,rpmh.h>
81+
#include <dt-bindings/gpio/gpio.h>
82+
#include <dt-bindings/interrupt-controller/arm-gic.h>
83+
#include <dt-bindings/interconnect/qcom,sa8775p-rpmh.h>
84+
85+
soc {
86+
#address-cells = <2>;
87+
#size-cells = <2>;
88+
89+
pcie@1c00000 {
90+
compatible = "qcom,pcie-sa8775p";
91+
reg = <0x0 0x01c00000 0x0 0x3000>,
92+
<0x0 0x40000000 0x0 0xf20>,
93+
<0x0 0x40000f20 0x0 0xa8>,
94+
<0x0 0x40001000 0x0 0x4000>,
95+
<0x0 0x40100000 0x0 0x100000>,
96+
<0x0 0x01c03000 0x0 0x1000>;
97+
reg-names = "parf", "dbi", "elbi", "atu", "config", "mhi";
98+
ranges = <0x01000000 0x0 0x00000000 0x0 0x40200000 0x0 0x100000>,
99+
<0x02000000 0x0 0x40300000 0x0 0x40300000 0x0 0x1fd00000>;
100+
101+
bus-range = <0x00 0xff>;
102+
device_type = "pci";
103+
linux,pci-domain = <0>;
104+
num-lanes = <2>;
105+
106+
#address-cells = <3>;
107+
#size-cells = <2>;
108+
109+
assigned-clocks = <&gcc GCC_PCIE_0_AUX_CLK>;
110+
assigned-clock-rates = <19200000>;
111+
112+
clocks = <&gcc GCC_PCIE_0_AUX_CLK>,
113+
<&gcc GCC_PCIE_0_CFG_AHB_CLK>,
114+
<&gcc GCC_PCIE_0_MSTR_AXI_CLK>,
115+
<&gcc GCC_PCIE_0_SLV_AXI_CLK>,
116+
<&gcc GCC_PCIE_0_SLV_Q2A_AXI_CLK>;
117+
clock-names = "aux",
118+
"cfg",
119+
"bus_master",
120+
"bus_slave",
121+
"slave_q2a";
122+
123+
dma-coherent;
124+
125+
interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>,
126+
<GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
127+
<GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
128+
<GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
129+
<GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
130+
<GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
131+
<GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>,
132+
<GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
133+
interrupt-names = "msi0",
134+
"msi1",
135+
"msi2",
136+
"msi3",
137+
"msi4",
138+
"msi5",
139+
"msi6",
140+
"msi7";
141+
#interrupt-cells = <1>;
142+
interrupt-map-mask = <0 0 0 0x7>;
143+
interrupt-map = <0 0 0 1 &intc GIC_SPI 434 IRQ_TYPE_LEVEL_HIGH>,
144+
<0 0 0 2 &intc GIC_SPI 435 IRQ_TYPE_LEVEL_HIGH>,
145+
<0 0 0 3 &intc GIC_SPI 438 IRQ_TYPE_LEVEL_HIGH>,
146+
<0 0 0 4 &intc GIC_SPI 439 IRQ_TYPE_LEVEL_HIGH>;
147+
148+
interconnects = <&pcie_anoc MASTER_PCIE_0 0 &mc_virt SLAVE_EBI1 0>,
149+
<&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_PCIE_0 0>;
150+
interconnect-names = "pcie-mem", "cpu-pcie";
151+
152+
iommu-map = <0x0 &pcie_smmu 0x0000 0x1>,
153+
<0x100 &pcie_smmu 0x0001 0x1>;
154+
155+
phys = <&pcie0_phy>;
156+
phy-names = "pciephy";
157+
158+
power-domains = <&gcc PCIE_0_GDSC>;
159+
160+
resets = <&gcc GCC_PCIE_0_BCR>;
161+
reset-names = "pci";
162+
163+
perst-gpios = <&tlmm 2 GPIO_ACTIVE_LOW>;
164+
wake-gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>;
165+
};
166+
};

0 commit comments

Comments
 (0)