Skip to content

Commit 207bcb7

Browse files
committed
Merge branch 'pci/dt-bindings'
- Drop minItems and maxItems from ranges in PCI generic host binding since host bridges may have several MMIO and I/O port apertures (Frank Li) - Add kirin, rcar-gen2, uniphier DT binding top-level constraints for clocks (Krzysztof Kozlowski) - Replace layerscape-pcie DT binding compatible fsl,lx2160a-pcie with fsl,lx2160ar2-pcie (Frank Li) - Add layerscape-pcie DT binding deprecated 'num-viewport' property to address a DT checker warning (Frank Li) - Change layerscape-pcie DT binding 'fsl,pcie-scfg' to phandle-array (Frank Li) - Update qcom,pcie-sc7280 DT binding with eight interrupts (Rayyan Ansari) - Convert altera DT bindings from text to YAML (Matthew Gerlach) - Add imx6q-pcie 'dbi2' and 'atu' reg-names for i.MX8M Endpoints (Richard Zhu) - Add back qcom 'vddpe-3v3-supply', which was incorrectly removed earlier (Johan Hovold) * pci/dt-bindings: dt-bindings: PCI: qcom: Allow 'vddpe-3v3-supply' again dt-bindings: PCI: imx6q-pcie: Add reg-name "dbi2" and "atu" for i.MX8M PCIe Endpoint dt-bindings: PCI: altera: msi: Convert to YAML dt-bindings: PCI: altera: Convert to YAML dt-bindings: PCI: qcom,pcie-sc7280: Update bindings adding eight interrupts dt-bindings: PCI: layerscape-pci: Change property 'fsl,pcie-scfg' type dt-bindings: PCI: layerscape-pci: Add deprecated property 'num-viewport' dt-bindings: PCI: layerscape-pci: Replace fsl,lx2160a-pcie with fsl,lx2160ar2-pcie dt-bindings: PCI: socionext,uniphier-pcie-ep: Add top-level constraints dt-bindings: PCI: renesas,pci-rcar-gen2: Add top-level constraints dt-bindings: PCI: hisilicon,kirin-pcie: Add top-level constraints dt-bindings: PCI: host-generic-pci: Drop minItems and maxItems of ranges
2 parents ed072e4 + 3cd3b49 commit 207bcb7

15 files changed

Lines changed: 258 additions & 113 deletions

Documentation/devicetree/bindings/pci/altera-pcie-msi.txt

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

Documentation/devicetree/bindings/pci/altera-pcie.txt

Lines changed: 0 additions & 50 deletions
This file was deleted.
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
# Copyright (C) 2015, 2024, Intel Corporation
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/altr,msi-controller.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Altera PCIe MSI controller
9+
10+
maintainers:
11+
- Matthew Gerlach <matthew.gerlach@linux.intel.com>
12+
13+
properties:
14+
compatible:
15+
enum:
16+
- altr,msi-1.0
17+
18+
reg:
19+
items:
20+
- description: CSR registers
21+
- description: Vectors slave port region
22+
23+
reg-names:
24+
items:
25+
- const: csr
26+
- const: vector_slave
27+
28+
interrupts:
29+
maxItems: 1
30+
31+
msi-controller: true
32+
33+
num-vectors:
34+
description: number of vectors
35+
$ref: /schemas/types.yaml#/definitions/uint32
36+
minimum: 1
37+
maximum: 32
38+
39+
required:
40+
- compatible
41+
- reg
42+
- reg-names
43+
- interrupts
44+
- msi-controller
45+
- num-vectors
46+
47+
allOf:
48+
- $ref: /schemas/interrupt-controller/msi-controller.yaml#
49+
50+
unevaluatedProperties: false
51+
52+
examples:
53+
- |
54+
#include <dt-bindings/interrupt-controller/arm-gic.h>
55+
#include <dt-bindings/interrupt-controller/irq.h>
56+
msi@ff200000 {
57+
compatible = "altr,msi-1.0";
58+
reg = <0xff200000 0x00000010>,
59+
<0xff200010 0x00000080>;
60+
reg-names = "csr", "vector_slave";
61+
interrupt-parent = <&hps_0_arm_gic_0>;
62+
interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
63+
msi-controller;
64+
num-vectors = <32>;
65+
};
Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
# Copyright (C) 2015, 2019, 2024, Intel Corporation
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/altr,pcie-root-port.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Altera PCIe Root Port
9+
10+
maintainers:
11+
- Matthew Gerlach <matthew.gerlach@linux.intel.com>
12+
13+
properties:
14+
compatible:
15+
enum:
16+
- altr,pcie-root-port-1.0
17+
- altr,pcie-root-port-2.0
18+
19+
reg:
20+
items:
21+
- description: TX slave port region
22+
- description: Control register access region
23+
- description: Hard IP region
24+
minItems: 2
25+
26+
reg-names:
27+
items:
28+
- const: Txs
29+
- const: Cra
30+
- const: Hip
31+
minItems: 2
32+
33+
interrupts:
34+
maxItems: 1
35+
36+
interrupt-controller: true
37+
38+
interrupt-map-mask:
39+
items:
40+
- const: 0
41+
- const: 0
42+
- const: 0
43+
- const: 7
44+
45+
interrupt-map:
46+
maxItems: 4
47+
48+
"#interrupt-cells":
49+
const: 1
50+
51+
msi-parent: true
52+
53+
required:
54+
- compatible
55+
- reg
56+
- reg-names
57+
- interrupts
58+
- "#interrupt-cells"
59+
- interrupt-controller
60+
- interrupt-map
61+
- interrupt-map-mask
62+
63+
allOf:
64+
- $ref: /schemas/pci/pci-host-bridge.yaml#
65+
- if:
66+
properties:
67+
compatible:
68+
enum:
69+
- altr,pcie-root-port-1.0
70+
then:
71+
properties:
72+
reg:
73+
maxItems: 2
74+
75+
reg-names:
76+
maxItems: 2
77+
78+
else:
79+
properties:
80+
reg:
81+
minItems: 3
82+
83+
reg-names:
84+
minItems: 3
85+
86+
87+
unevaluatedProperties: false
88+
89+
examples:
90+
- |
91+
#include <dt-bindings/interrupt-controller/arm-gic.h>
92+
#include <dt-bindings/interrupt-controller/irq.h>
93+
pcie_0: pcie@c00000000 {
94+
compatible = "altr,pcie-root-port-1.0";
95+
reg = <0xc0000000 0x20000000>,
96+
<0xff220000 0x00004000>;
97+
reg-names = "Txs", "Cra";
98+
interrupt-parent = <&hps_0_arm_gic_0>;
99+
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
100+
interrupt-controller;
101+
#interrupt-cells = <1>;
102+
bus-range = <0x0 0xff>;
103+
device_type = "pci";
104+
msi-parent = <&msi_to_gic_gen_0>;
105+
#address-cells = <3>;
106+
#size-cells = <2>;
107+
interrupt-map-mask = <0 0 0 7>;
108+
interrupt-map = <0 0 0 1 &pcie_0 0 0 0 1>,
109+
<0 0 0 2 &pcie_0 0 0 0 2>,
110+
<0 0 0 3 &pcie_0 0 0 0 3>,
111+
<0 0 0 4 &pcie_0 0 0 0 4>;
112+
ranges = <0x82000000 0x00000000 0x00000000 0xc0000000 0x00000000 0x10000000>,
113+
<0x82000000 0x00000000 0x10000000 0xd0000000 0x00000000 0x10000000>;
114+
};

Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,14 @@ allOf:
6565
then:
6666
properties:
6767
reg:
68-
minItems: 2
69-
maxItems: 2
68+
minItems: 4
69+
maxItems: 4
7070
reg-names:
7171
items:
7272
- const: dbi
7373
- const: addr_space
74+
- const: dbi2
75+
- const: atu
7476

7577
- if:
7678
properties:
@@ -129,8 +131,11 @@ examples:
129131
130132
pcie_ep: pcie-ep@33800000 {
131133
compatible = "fsl,imx8mp-pcie-ep";
132-
reg = <0x33800000 0x000400000>, <0x18000000 0x08000000>;
133-
reg-names = "dbi", "addr_space";
134+
reg = <0x33800000 0x100000>,
135+
<0x18000000 0x8000000>,
136+
<0x33900000 0x100000>,
137+
<0x33b00000 0x100000>;
138+
reg-names = "dbi", "addr_space", "dbi2", "atu";
134139
clocks = <&clk IMX8MP_CLK_HSIO_ROOT>,
135140
<&clk IMX8MP_CLK_HSIO_AXI>,
136141
<&clk IMX8MP_CLK_PCIE_ROOT>;

Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,20 @@ description:
2222

2323
properties:
2424
compatible:
25-
enum:
26-
- fsl,ls1021a-pcie
27-
- fsl,ls2080a-pcie
28-
- fsl,ls2085a-pcie
29-
- fsl,ls2088a-pcie
30-
- fsl,ls1088a-pcie
31-
- fsl,ls1046a-pcie
32-
- fsl,ls1043a-pcie
33-
- fsl,ls1012a-pcie
34-
- fsl,ls1028a-pcie
35-
- fsl,lx2160a-pcie
36-
25+
oneOf:
26+
- enum:
27+
- fsl,ls1012a-pcie
28+
- fsl,ls1021a-pcie
29+
- fsl,ls1028a-pcie
30+
- fsl,ls1043a-pcie
31+
- fsl,ls1046a-pcie
32+
- fsl,ls1088a-pcie
33+
- fsl,ls2080a-pcie
34+
- fsl,ls2085a-pcie
35+
- fsl,ls2088a-pcie
36+
- items:
37+
- const: fsl,lx2160ar2-pcie
38+
- const: fsl,ls2088a-pcie
3739
reg:
3840
maxItems: 2
3941

@@ -43,10 +45,15 @@ properties:
4345
- const: config
4446

4547
fsl,pcie-scfg:
46-
$ref: /schemas/types.yaml#/definitions/phandle
48+
$ref: /schemas/types.yaml#/definitions/phandle-array
4749
description: A phandle to the SCFG device node. The second entry is the
4850
physical PCIe controller index starting from '0'. This is used to get
4951
SCFG PEXN registers.
52+
items:
53+
items:
54+
- description: A phandle to the SCFG device node
55+
- description: PCIe controller index starting from '0'
56+
maxItems: 1
5057

5158
big-endian:
5259
$ref: /schemas/types.yaml#/definitions/flag
@@ -67,6 +74,14 @@ properties:
6774
minItems: 1
6875
maxItems: 2
6976

77+
num-viewport:
78+
$ref: /schemas/types.yaml#/definitions/uint32
79+
deprecated: true
80+
description:
81+
Number of outbound view ports configured in hardware. It's the same as
82+
the number of outbound AT windows.
83+
maximum: 256
84+
7085
required:
7186
- compatible
7287
- reg

Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ properties:
3737
minItems: 3
3838
maxItems: 4
3939

40-
clocks: true
40+
clocks:
41+
maxItems: 5
4142

4243
clock-names:
4344
items:

Documentation/devicetree/bindings/pci/host-generic-pci.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ properties:
102102
As described in IEEE Std 1275-1994, but must provide at least a
103103
definition of non-prefetchable memory. One or both of prefetchable Memory
104104
and IO Space may also be provided.
105-
minItems: 1
106-
maxItems: 3
107105

108106
dma-coherent: true
109107
iommu-map: true

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ properties:
7878
description: GPIO controlled connection to WAKE# signal
7979
maxItems: 1
8080

81+
vddpe-3v3-supply:
82+
description: PCIe endpoint power supply
83+
8184
required:
8285
- reg
8386
- reg-names

0 commit comments

Comments
 (0)