Skip to content

Commit b810fec

Browse files
bjorn-helgaasbjorn-helgaas
committed
Merge branch 'pci/dt-bindings'
- Add qcom,pcie-ipq5332 binding (Varadarajan Narayanan) - Convert fsl,mpc83xx-pcie binding to YAML (J. Neuschäfer) - Add qcom i.MX8QM and i.MX8QXP/DXP optional DMA interrupt (Alexander Stein) - Drop deprecated layerscape 'num-ib-windows' and 'num-ob-windows' from example (Krzysztof Kozlowski) - Drop unnecessary layerscape 'status' from example (Krzysztof Kozlowski) - Add common pci-ep-bus.yaml schema for exporting several peripherals of a single PCI function via devicetree (Andrea della Porta) * pci/dt-bindings: dt-bindings: PCI: Add common schema for devices accessible through PCI BARs dt-bindings: PCI: fsl,layerscape-pcie-ep: Drop unnecessary status from example dt-bindings: PCI: fsl,layerscape-pcie-ep: Drop deprecated windows dt-bindings: PCI: fsl,imx6q-pcie: Add optional DMA interrupt dt-bindings: PCI: Convert fsl,mpc83xx-pcie to YAML dt-bindings: PCI: qcom: Document the IPQ5332 PCIe controller
2 parents a1aed6b + 01a1e9d commit b810fec

6 files changed

Lines changed: 181 additions & 32 deletions

File tree

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,16 @@ properties:
4747
maxItems: 5
4848

4949
interrupts:
50+
minItems: 1
5051
items:
5152
- description: builtin MSI controller.
53+
- description: builtin DMA controller.
5254

5355
interrupt-names:
56+
minItems: 1
5457
items:
5558
- const: msi
59+
- const: dma
5660

5761
reset-gpio:
5862
description: Should specify the GPIO for controlling the PCI bus device

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ examples:
9494
reg-names = "regs", "addr_space";
9595
interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; /* PME interrupt */
9696
interrupt-names = "pme";
97-
num-ib-windows = <6>;
98-
num-ob-windows = <8>;
99-
status = "disabled";
10097
};
10198
};
10299
...

‎Documentation/devicetree/bindings/pci/fsl,mpc8xxx-pci.yaml‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
5+
$id: http://devicetree.org/schemas/pci/fsl,mpc8xxx-pci.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Freescale MPC83xx PCI/PCI-X/PCIe controllers
9+
10+
description:
11+
Binding for the PCI/PCI-X/PCIe host bridges on MPC8xxx SoCs
12+
13+
maintainers:
14+
- J. Neuschäfer <j.neuschaefer@gmx.net>
15+
16+
allOf:
17+
- $ref: /schemas/pci/pci-host-bridge.yaml#
18+
19+
properties:
20+
compatible:
21+
oneOf:
22+
- enum:
23+
- fsl,mpc8314-pcie
24+
- fsl,mpc8349-pci
25+
- fsl,mpc8540-pci
26+
- fsl,mpc8548-pcie
27+
- fsl,mpc8641-pcie
28+
- items:
29+
- enum:
30+
- fsl,mpc8308-pcie
31+
- fsl,mpc8315-pcie
32+
- fsl,mpc8377-pcie
33+
- fsl,mpc8378-pcie
34+
- const: fsl,mpc8314-pcie
35+
- items:
36+
- const: fsl,mpc8360-pci
37+
- const: fsl,mpc8349-pci
38+
- items:
39+
- const: fsl,mpc8540-pcix
40+
- const: fsl,mpc8540-pci
41+
42+
reg:
43+
minItems: 1
44+
items:
45+
- description: internal registers
46+
- description: config space access registers
47+
48+
clock-frequency: true
49+
50+
interrupts:
51+
items:
52+
- description: Consolidated PCI interrupt
53+
54+
fsl,pci-agent-force-enum:
55+
type: boolean
56+
description:
57+
Typically any Freescale PCI-X bridge hardware strapped into Agent mode is
58+
prevented from enumerating the bus. The PrPMC form-factor requires all
59+
mezzanines to be PCI-X Agents, but one per system may still enumerate the
60+
bus.
61+
62+
This property allows a PCI-X bridge to be used for bus enumeration
63+
despite being strapped into Agent mode.
64+
65+
required:
66+
- reg
67+
- compatible
68+
69+
unevaluatedProperties: false
70+
71+
examples:
72+
- |
73+
#include <dt-bindings/interrupt-controller/irq.h>
74+
75+
pcie@e0009000 {
76+
compatible = "fsl,mpc8315-pcie", "fsl,mpc8314-pcie";
77+
reg = <0xe0009000 0x00001000>;
78+
ranges = <0x02000000 0 0xa0000000 0xa0000000 0 0x10000000
79+
0x01000000 0 0x00000000 0xb1000000 0 0x00800000>;
80+
#address-cells = <3>;
81+
#size-cells = <2>;
82+
#interrupt-cells = <1>;
83+
device_type = "pci";
84+
bus-range = <0 255>;
85+
interrupt-map-mask = <0xf800 0 0 7>;
86+
interrupt-map = <0 0 0 1 &ipic 1 IRQ_TYPE_LEVEL_LOW
87+
0 0 0 2 &ipic 1 IRQ_TYPE_LEVEL_LOW
88+
0 0 0 3 &ipic 1 IRQ_TYPE_LEVEL_LOW
89+
0 0 0 4 &ipic 1 IRQ_TYPE_LEVEL_LOW>;
90+
clock-frequency = <0>;
91+
};
92+
93+
- |
94+
pci@ef008000 {
95+
compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
96+
reg = <0xef008000 0x1000>;
97+
ranges = <0x02000000 0 0x80000000 0x80000000 0 0x20000000
98+
0x01000000 0 0x00000000 0xd0000000 0 0x01000000>;
99+
#interrupt-cells = <1>;
100+
#size-cells = <2>;
101+
#address-cells = <3>;
102+
device_type = "pci";
103+
clock-frequency = <33333333>;
104+
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
105+
interrupt-map = </* IDSEL */
106+
0xe000 0 0 1 &mpic 2 1
107+
0xe000 0 0 2 &mpic 3 1>;
108+
interrupts-extended = <&mpic 24 2>;
109+
bus-range = <0 0>;
110+
fsl,pci-agent-force-enum;
111+
};
112+
113+
...

‎Documentation/devicetree/bindings/pci/fsl,pci.txt‎

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

‎Documentation/devicetree/bindings/pci/pci-ep-bus.yaml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pci/pci-ep-bus.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Common Properties for PCI MFD EP with Peripherals Addressable from BARs
8+
9+
maintainers:
10+
- A. della Porta <andrea.porta@suse.com>
11+
12+
description:
13+
Define a generic node representing a PCI endpoint which contains several sub-
14+
peripherals. The peripherals can be accessed through one or more BARs.
15+
This common schema is intended to be referenced from device tree bindings and
16+
does not represent a device tree binding by itself.
17+
18+
properties:
19+
'#address-cells':
20+
const: 3
21+
22+
'#size-cells':
23+
const: 2
24+
25+
ranges:
26+
minItems: 1
27+
maxItems: 6
28+
items:
29+
maxItems: 8
30+
additionalItems: true
31+
items:
32+
- maximum: 5 # The BAR number
33+
- const: 0
34+
- const: 0
35+
36+
patternProperties:
37+
'^pci-ep-bus@[0-5]$':
38+
type: object
39+
description:
40+
One node for each BAR used by peripherals contained in the PCI endpoint.
41+
Each node represents a bus on which peripherals are connected.
42+
This allows for some segmentation, e.g., one peripheral is accessible
43+
through BAR0 and another through BAR1, and you don't want the two
44+
peripherals to be able to act on the other BAR. Alternatively, when
45+
different peripherals need to share BARs, you can define only one node
46+
and use a 'ranges' property to map all the used BARs.
47+
48+
additionalProperties: true
49+
50+
properties:
51+
compatible:
52+
const: simple-bus
53+
54+
required:
55+
- compatible
56+
57+
additionalProperties: true
58+
...

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ properties:
3333
- qcom,pcie-sdx55
3434
- items:
3535
- enum:
36+
- qcom,pcie-ipq5332
3637
- qcom,pcie-ipq5424
3738
- const: qcom,pcie-ipq9574
3839
- items:
@@ -49,11 +50,11 @@ properties:
4950

5051
interrupts:
5152
minItems: 1
52-
maxItems: 8
53+
maxItems: 9
5354

5455
interrupt-names:
5556
minItems: 1
56-
maxItems: 8
57+
maxItems: 9
5758

5859
iommu-map:
5960
minItems: 1
@@ -443,6 +444,7 @@ allOf:
443444
interrupts:
444445
minItems: 8
445446
interrupt-names:
447+
minItems: 8
446448
items:
447449
- const: msi0
448450
- const: msi1
@@ -452,6 +454,7 @@ allOf:
452454
- const: msi5
453455
- const: msi6
454456
- const: msi7
457+
- const: global
455458

456459
- if:
457460
properties:
@@ -599,6 +602,7 @@ allOf:
599602
- properties:
600603
interrupts:
601604
minItems: 8
605+
maxItems: 8
602606
interrupt-names:
603607
items:
604608
- const: msi0

0 commit comments

Comments
 (0)