Skip to contentSkip to conversation

dt-bindings: PCI: qcom,pcie-sm8350: Drop redundant 'oneOf' sub-schema

PATCH Applied Rob Herring (Arm) 3 participants 4 messages Apr 17, 2024 – Apr 30, 2024

Subsystems (5)
Device tree bindings Arm Qualcomm mailing list PCI PCI native host bridge and endpoint drivers +1 more subsystems
lore
Share & tools
lore

Rob Herring (Arm)

author maintainer
#0 lore raw

PATCH 1/1 dt-bindings: PCI: qcom,pcie-sm8350: Drop redundant 'oneOf' sub-schema

The first entry in the 'oneOf' schema doesn't work because the top level schema requires exactly 8 interrupt entries. The 2nd entry is just redundant with the top level. Since 1 entry appears to have been a mistake, let's just drop the entire 'oneOf' rather than reworking the top-level to allow 1 entry.

Signed-off-by Rob Herring (Arm) <[email protected]>
---
 .../bindings/pci/qcom,pcie-sm8350.yaml        | 22 -------------------
 1 file changed, 22 deletions(-)
Documentation/devicetree/bindings/pci/qcom,pcie-sm8350.yaml +0 -22
index 9eb6e457b07f..2a4cc41fc710 100644
@@ -71,28 +71,6 @@ properties:
     items:
       - const: pci
 
-oneOf:
-  - properties:
-      interrupts:
-        maxItems: 1
-      interrupt-names:
-        items:
-          - const: msi
-
-  - properties:
-      interrupts:
-        minItems: 8
-      interrupt-names:
-        items:
-          - const: msi0
-          - const: msi1
-          - const: msi2
-          - const: msi3
-          - const: msi4
-          - const: msi5
-          - const: msi6
-          - const: msi7
-
 allOf:
   - $ref: qcom,pcie-common.yaml#
Signature · 1 line
2.43.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Rob Herring (Arm)

The first entry in the 'oneOf' schema doesn't work because the top level schema requires exactly 8 interrupt entries. The 2nd entry is just redundant with the top level. Since 1 entry appears to have been a mistake, let's just drop the entire 'oneOf' rather than reworking the top-level to allow 1 entry.

Signed-off-by Rob Herring (Arm) <[email protected]>

Indeed, copy-pasta. 8 entries is correct, just sometimes we were all too lazy to describe all of them in DTS.

Reviewed-by Krzysztof Kozlowski <[email protected]>

Best regards,
Krzysztof

Reviewed-by on v1 1/1
#2 lore raw
In reply to Rob Herring (Arm)
Quoted 7 lines · Rob Herring (Arm)

The first entry in the 'oneOf' schema doesn't work because the top level schema requires exactly 8 interrupt entries. The 2nd entry is just redundant with the top level. Since 1 entry appears to have been a mistake, let's just drop the entire 'oneOf' rather than reworking the top-level to allow 1 entry.

Signed-off-by Rob Herring (Arm) <[email protected]>
Reviewed-by Manivannan Sadhasivam <[email protected]>

- Mani

Quoted 40 lines
---
 .../bindings/pci/qcom,pcie-sm8350.yaml        | 22 -------------------
 1 file changed, 22 deletions(-)
Documentation/devicetree/bindings/pci/qcom,pcie-sm8350.yaml +0 -22
index 9eb6e457b07f..2a4cc41fc710 100644
@@ -71,28 +71,6 @@ properties:
     items:
       - const: pci
 
-oneOf:
-  - properties:
-      interrupts:
-        maxItems: 1
-      interrupt-names:
-        items:
-          - const: msi
-
-  - properties:
-      interrupts:
-        minItems: 8
-      interrupt-names:
-        items:
-          - const: msi0
-          - const: msi1
-          - const: msi2
-          - const: msi3
-          - const: msi4
-          - const: msi5
-          - const: msi6
-          - const: msi7
-
 allOf:
   - $ref: qcom,pcie-common.yaml#
Signature · 1 line
2.43.0
Signature · 1 line
மணிவண்ணன் சதாசிவம்
author maintainer Applied
#3 lore raw
In reply to Rob Herring (Arm)
Quoted 11 lines · Rob Herring (Arm)

The first entry in the 'oneOf' schema doesn't work because the top level schema requires exactly 8 interrupt entries. The 2nd entry is just redundant with the top level. Since 1 entry appears to have been a mistake, let's just drop the entire 'oneOf' rather than reworking the top-level to allow 1 entry.

Signed-off-by Rob Herring (Arm) <[email protected]>
---
 .../bindings/pci/qcom,pcie-sm8350.yaml        | 22 -------------------
 1 file changed, 22 deletions(-)

Applied, thanks!