Skip to content

Commit 11fdf08

Browse files
committed
Merge branch 'pci/dt-bindings'
- Add Qualcomm QCS615 to SM8150 DT binding (Ziyue Zhang) - Add Qualcomm QCS8300 to SA8775p DT binding (Ziyue Zhang) - Add '6' (64 GT/s, aka Gen6) as a legal value for the DT endpoint 'max-link-speed' property (Hans Zhang) - Drop TBU and ref clocks from Qualcomm SM8150 and SC8180x DT bindings (Konrad Dybcio) - Convert amazon,al-alpine-v[23]-pcie, apm,xgene-pcie, axis,artpec6-pcie, marvell,armada-3700-pcie, st,spear1340-pcie to DT schema format (Rob Herring) - Document 'link_down' reset in Qualcomm SA8775P DT binding (Ziyue Zhang) * pci/dt-bindings: dt-bindings: PCI: qcom,pcie-sa8775p: Document 'link_down' reset dt-bindings: PCI: Remove 83xx-512x-pci.txt dt-bindings: PCI: Convert amazon,al-alpine-v[23]-pcie to DT schema dt-bindings: PCI: Convert marvell,armada-3700-pcie to DT schema dt-bindings: PCI: Convert apm,xgene-pcie to DT schema dt-bindings: PCI: Convert axis,artpec6-pcie to DT schema dt-bindings: PCI: Convert st,spear1340-pcie to DT schema dt-bindings: PCI: qcom,pcie-sm8150: Drop unrelated clocks from PCIe hosts dt-bindings: PCI: qcom,pcie-sc8180x: Drop unrelated clocks from PCIe hosts dt-bindings: PCI: pci-ep: Extend max-link-speed to PCIe Gen5/Gen6 dt-bindings: PCI: qcom,pcie-sa8775p: Document QCS8300 dt-bindings: PCI: qcom,pcie-sm8150: Document QCS615
2 parents 29ccb7b + fbcbd66 commit 11fdf08

17 files changed

Lines changed: 450 additions & 288 deletions

Documentation/devicetree/bindings/pci/83xx-512x-pci.txt

Lines changed: 0 additions & 39 deletions
This file was deleted.

Documentation/devicetree/bindings/pci/aardvark-pci.txt

Lines changed: 0 additions & 59 deletions
This file was deleted.
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pci/amazon,al-alpine-v3-pcie.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Amazon Annapurna Labs Alpine v3 PCIe Host Bridge
8+
9+
maintainers:
10+
- Jonathan Chocron <jonnyc@amazon.com>
11+
12+
description:
13+
Amazon's Annapurna Labs PCIe Host Controller is based on the Synopsys
14+
DesignWare PCI controller.
15+
16+
allOf:
17+
- $ref: snps,dw-pcie.yaml#
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- amazon,al-alpine-v2-pcie
23+
- amazon,al-alpine-v3-pcie
24+
25+
reg:
26+
items:
27+
- description: PCIe ECAM space
28+
- description: AL proprietary registers
29+
- description: Designware PCIe registers
30+
31+
reg-names:
32+
items:
33+
- const: config
34+
- const: controller
35+
- const: dbi
36+
37+
interrupts:
38+
maxItems: 1
39+
40+
unevaluatedProperties: false
41+
42+
required:
43+
- compatible
44+
- reg
45+
- reg-names
46+
47+
examples:
48+
- |
49+
#include <dt-bindings/interrupt-controller/arm-gic.h>
50+
51+
bus {
52+
#address-cells = <2>;
53+
#size-cells = <2>;
54+
55+
pcie@fb600000 {
56+
compatible = "amazon,al-alpine-v3-pcie";
57+
reg = <0x0 0xfb600000 0x0 0x00100000
58+
0x0 0xfd800000 0x0 0x00010000
59+
0x0 0xfd810000 0x0 0x00001000>;
60+
reg-names = "config", "controller", "dbi";
61+
bus-range = <0 255>;
62+
device_type = "pci";
63+
#address-cells = <3>;
64+
#size-cells = <2>;
65+
#interrupt-cells = <1>;
66+
interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
67+
interrupt-map-mask = <0x00 0 0 7>;
68+
interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; /* INTa */
69+
ranges = <0x02000000 0x0 0xc0010000 0x0 0xc0010000 0x0 0x07ff0000>;
70+
};
71+
};
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pci/apm,xgene-pcie.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: AppliedMicro X-Gene PCIe interface
8+
9+
maintainers:
10+
- Toan Le <toan@os.amperecomputing.com>
11+
12+
allOf:
13+
- $ref: /schemas/pci/pci-host-bridge.yaml#
14+
15+
properties:
16+
compatible:
17+
oneOf:
18+
- items:
19+
- const: apm,xgene-storm-pcie
20+
- const: apm,xgene-pcie
21+
- items:
22+
- const: apm,xgene-pcie
23+
24+
reg:
25+
items:
26+
- description: Controller configuration registers
27+
- description: PCI configuration space registers
28+
29+
reg-names:
30+
items:
31+
- const: csr
32+
- const: cfg
33+
34+
clocks:
35+
maxItems: 1
36+
37+
clock-names:
38+
items:
39+
- const: pcie
40+
41+
dma-coherent: true
42+
43+
msi-parent:
44+
maxItems: 1
45+
46+
required:
47+
- compatible
48+
- reg
49+
- reg-names
50+
- '#interrupt-cells'
51+
- interrupt-map-mask
52+
- interrupt-map
53+
- clocks
54+
55+
unevaluatedProperties: false
56+
57+
examples:
58+
- |
59+
bus {
60+
#address-cells = <2>;
61+
#size-cells = <2>;
62+
63+
pcie@1f2b0000 {
64+
compatible = "apm,xgene-storm-pcie", "apm,xgene-pcie";
65+
device_type = "pci";
66+
#interrupt-cells = <1>;
67+
#size-cells = <2>;
68+
#address-cells = <3>;
69+
reg = <0x00 0x1f2b0000 0x0 0x00010000>, /* Controller registers */
70+
<0xe0 0xd0000000 0x0 0x00040000>; /* PCI config space */
71+
reg-names = "csr", "cfg";
72+
ranges = <0x01000000 0x00 0x00000000 0xe0 0x10000000 0x00 0x00010000>, /* io */
73+
<0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000>; /* mem */
74+
dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000>,
75+
<0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
76+
interrupt-map-mask = <0x0 0x0 0x0 0x7>;
77+
interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xc2 0x1>,
78+
<0x0 0x0 0x0 0x2 &gic 0x0 0xc3 0x1>,
79+
<0x0 0x0 0x0 0x3 &gic 0x0 0xc4 0x1>,
80+
<0x0 0x0 0x0 0x4 &gic 0x0 0xc5 0x1>;
81+
dma-coherent;
82+
clocks = <&pcie0clk 0>;
83+
};
84+
};

Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)