Skip to content

Commit 9440106

Browse files
committed
Merge branch 'pci/dt-binding'
- Correct indentation in qcom,pcie-sa8255p.yaml and amd,versal2-mdb-host.yaml so they indent with four spaces consistently (Krzysztof Kozlowski) - Add SM8750 compatible to qcom,pcie-sm8550.yaml (Krishna Chaitanya Chundru) - Add Peripheral Virtualization Unit (PVU), which restricts DMA from PCIe devices to specific regions of host memory, to the ti,am65 binding (Jan Kiszka) - Update qcom,pcie-x1e80100.yaml to allow fifth PCIe host on Qualcomm Glymur, which is compatible with X1E80100 but doesn't have the cnoc_sf_axi clock (Qiang Yu) * pci/dt-binding: dt-bindings: PCI: qcom,pcie-x1e80100: Set clocks minItems for the fifth Glymur PCIe Controller dt-bindings: PCI: ti,am65: Extend for use with PVU dt-bindings: PCI: qcom,pcie-sm8550: Add SM8750 compatible dt-bindings: PCI: Correct example indentation
2 parents fef3530 + 96a17ed commit 9440106

File tree

5 files changed

+69
-45
lines changed

5 files changed

+69
-45
lines changed

Documentation/devicetree/bindings/pci/amd,versal2-mdb-host.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,6 @@ examples:
116116
#address-cells = <0>;
117117
#interrupt-cells = <1>;
118118
interrupt-controller;
119-
};
119+
};
120120
};
121121
};

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

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -77,46 +77,46 @@ examples:
7777
#size-cells = <2>;
7878
7979
pci@1c00000 {
80-
compatible = "qcom,pcie-sa8255p";
81-
reg = <0x4 0x00000000 0 0x10000000>;
82-
device_type = "pci";
83-
#address-cells = <3>;
84-
#size-cells = <2>;
85-
ranges = <0x02000000 0x0 0x40100000 0x0 0x40100000 0x0 0x1ff00000>,
86-
<0x43000000 0x4 0x10100000 0x4 0x10100000 0x0 0x40000000>;
87-
bus-range = <0x00 0xff>;
88-
dma-coherent;
89-
linux,pci-domain = <0>;
90-
power-domains = <&scmi5_pd 0>;
91-
iommu-map = <0x0 &pcie_smmu 0x0000 0x1>,
92-
<0x100 &pcie_smmu 0x0001 0x1>;
93-
interrupt-parent = <&intc>;
94-
interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>,
95-
<GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
96-
<GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
97-
<GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
98-
<GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
99-
<GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
100-
<GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>,
101-
<GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
102-
interrupt-names = "msi0", "msi1", "msi2", "msi3",
103-
"msi4", "msi5", "msi6", "msi7";
104-
105-
#interrupt-cells = <1>;
106-
interrupt-map-mask = <0 0 0 0x7>;
107-
interrupt-map = <0 0 0 1 &intc GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
108-
<0 0 0 2 &intc GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
109-
<0 0 0 3 &intc GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>,
110-
<0 0 0 4 &intc GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
111-
112-
pcie@0 {
113-
device_type = "pci";
114-
reg = <0x0 0x0 0x0 0x0 0x0>;
115-
bus-range = <0x01 0xff>;
116-
117-
#address-cells = <3>;
118-
#size-cells = <2>;
119-
ranges;
80+
compatible = "qcom,pcie-sa8255p";
81+
reg = <0x4 0x00000000 0 0x10000000>;
82+
device_type = "pci";
83+
#address-cells = <3>;
84+
#size-cells = <2>;
85+
ranges = <0x02000000 0x0 0x40100000 0x0 0x40100000 0x0 0x1ff00000>,
86+
<0x43000000 0x4 0x10100000 0x4 0x10100000 0x0 0x40000000>;
87+
bus-range = <0x00 0xff>;
88+
dma-coherent;
89+
linux,pci-domain = <0>;
90+
power-domains = <&scmi5_pd 0>;
91+
iommu-map = <0x0 &pcie_smmu 0x0000 0x1>,
92+
<0x100 &pcie_smmu 0x0001 0x1>;
93+
interrupt-parent = <&intc>;
94+
interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>,
95+
<GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
96+
<GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
97+
<GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
98+
<GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
99+
<GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
100+
<GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>,
101+
<GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
102+
interrupt-names = "msi0", "msi1", "msi2", "msi3",
103+
"msi4", "msi5", "msi6", "msi7";
104+
105+
#interrupt-cells = <1>;
106+
interrupt-map-mask = <0 0 0 0x7>;
107+
interrupt-map = <0 0 0 1 &intc GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
108+
<0 0 0 2 &intc GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
109+
<0 0 0 3 &intc GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>,
110+
<0 0 0 4 &intc GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
111+
112+
pcie@0 {
113+
device_type = "pci";
114+
reg = <0x0 0x0 0x0 0x0 0x0>;
115+
bus-range = <0x01 0xff>;
116+
117+
#address-cells = <3>;
118+
#size-cells = <2>;
119+
ranges;
120120
};
121121
};
122122
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ properties:
2222
- enum:
2323
- qcom,sar2130p-pcie
2424
- qcom,pcie-sm8650
25+
- qcom,pcie-sm8750
2526
- const: qcom,pcie-sm8550
2627

2728
reg:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ properties:
3232
- const: mhi # MHI registers
3333

3434
clocks:
35-
minItems: 7
35+
minItems: 6
3636
maxItems: 7
3737

3838
clock-names:
39+
minItems: 6
3940
items:
4041
- const: aux # Auxiliary clock
4142
- const: cfg # Configuration clock

Documentation/devicetree/bindings/pci/ti,am65-pci-host.yaml

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,18 @@ properties:
2020
- ti,keystone-pcie
2121

2222
reg:
23-
maxItems: 4
23+
minItems: 4
24+
maxItems: 6
2425

2526
reg-names:
27+
minItems: 4
2628
items:
2729
- const: app
2830
- const: dbics
2931
- const: config
3032
- const: atu
33+
- const: vmap_lp
34+
- const: vmap_hp
3135

3236
interrupts:
3337
maxItems: 1
@@ -69,6 +73,15 @@ properties:
6973
items:
7074
pattern: '^pcie-phy[0-1]$'
7175

76+
memory-region:
77+
maxItems: 1
78+
description: |
79+
phandle to a restricted DMA pool to be used for all devices behind
80+
this controller. The regions should be defined according to
81+
reserved-memory/shared-dma-pool.yaml.
82+
Note that enforcement via the PVU will only be available to
83+
ti,am654-pcie-rc devices.
84+
7285
required:
7386
- compatible
7487
- reg
@@ -89,6 +102,13 @@ then:
89102
- power-domains
90103
- msi-map
91104
- num-viewport
105+
else:
106+
properties:
107+
reg:
108+
maxItems: 4
109+
110+
reg-names:
111+
maxItems: 4
92112

93113
unevaluatedProperties: false
94114

@@ -104,8 +124,10 @@ examples:
104124
reg = <0x5500000 0x1000>,
105125
<0x5501000 0x1000>,
106126
<0x10000000 0x2000>,
107-
<0x5506000 0x1000>;
108-
reg-names = "app", "dbics", "config", "atu";
127+
<0x5506000 0x1000>,
128+
<0x2900000 0x1000>,
129+
<0x2908000 0x1000>;
130+
reg-names = "app", "dbics", "config", "atu", "vmap_lp", "vmap_hp";
109131
power-domains = <&k3_pds 120 TI_SCI_PD_EXCLUSIVE>;
110132
#address-cells = <3>;
111133
#size-cells = <2>;

0 commit comments

Comments
 (0)