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(-)
diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie-sm8350.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie-sm8350.yaml
index 9eb6e457b07f..2a4cc41fc710 100644
--- a/Documentation/devicetree/bindings/pci/qcom,pcie-sm8350.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie-sm8350.yaml
@@ -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#
--
2.43.0
On 17/04/2024 22:04, Rob Herring (Arm) wrote:
> 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
On Wed, Apr 17, 2024 at 03:04:30PM -0500, Rob Herring (Arm) wrote:
> 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
> ---
> .../bindings/pci/qcom,pcie-sm8350.yaml | 22 -------------------
> 1 file changed, 22 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie-sm8350.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie-sm8350.yaml
> index 9eb6e457b07f..2a4cc41fc710 100644
> --- a/Documentation/devicetree/bindings/pci/qcom,pcie-sm8350.yaml
> +++ b/Documentation/devicetree/bindings/pci/qcom,pcie-sm8350.yaml
> @@ -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#
>
> --
> 2.43.0
>
--
மணிவண்ணன் சதாசிவம்
On Wed, 17 Apr 2024 15:04:30 -0500, Rob Herring (Arm) wrote:
> 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!