Skip to content

Commit d6e201f

Browse files
committed
dt-bindings: PCI: brcm,iproc-pcie: Fix 'msi' child node schema
The 'msi' child node schema is missing constraints on additional properties. It turns out it is incomplete and properties for it are documented in the parent node by mistake. Move the reference to msi-controller.yaml and the custom properties to the 'msi' node. Adding 'unevaluatedProperties' ensures all the properties in the 'msi' node are documented. With the schema corrected, a minimal interrupt controller node is needed to properly decode the interrupt properties since the example has multiple interrupt parents. Acked-by: Conor Dooley <conor.dooley@microchip.com> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Fixes: 905b986 ("dt-bindings: pci: Convert iProc PCIe to YAML") Link: https://lore.kernel.org/r/20230926155613.33904-3-robh@kernel.org Signed-off-by: Rob Herring <robh@kernel.org>
1 parent e2745e6 commit d6e201f

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

Documentation/devicetree/bindings/pci/brcm,iproc-pcie.yaml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ maintainers:
1212

1313
allOf:
1414
- $ref: /schemas/pci/pci-bus.yaml#
15-
- $ref: /schemas/interrupt-controller/msi-controller.yaml#
1615

1716
properties:
1817
compatible:
@@ -63,20 +62,24 @@ properties:
6362
6463
msi:
6564
type: object
65+
$ref: /schemas/interrupt-controller/msi-controller.yaml#
66+
unevaluatedProperties: false
67+
6668
properties:
6769
compatible:
6870
items:
6971
- const: brcm,iproc-msi
7072

71-
msi-parent: true
73+
interrupts:
74+
maxItems: 4
7275

73-
msi-controller: true
76+
brcm,pcie-msi-inten:
77+
type: boolean
78+
description:
79+
Needs to be present for some older iProc platforms that require the
80+
interrupt enable registers to be set explicitly to enable MSI
7481

75-
brcm,pcie-msi-inten:
76-
type: boolean
77-
description: >
78-
Needs to be present for some older iProc platforms that require the
79-
interrupt enable registers to be set explicitly to enable MSI
82+
msi-parent: true
8083

8184
dependencies:
8285
brcm,pcie-ob-axi-offset: ["brcm,pcie-ob"]
@@ -104,6 +107,11 @@ examples:
104107
- |
105108
#include <dt-bindings/interrupt-controller/arm-gic.h>
106109
110+
gic: interrupt-controller {
111+
interrupt-controller;
112+
#interrupt-cells = <3>;
113+
};
114+
107115
pcie@18012000 {
108116
compatible = "brcm,iproc-pcie";
109117
reg = <0x18012000 0x1000>;

0 commit comments

Comments
 (0)