[PATCH] dt-bindings: PCI: faraday,ftpci100: Fix 'contains' schema usage

Subsystems: open firmware and flattened device tree bindings, pci native host bridge and endpoint drivers, pci subsystem, the rest

STALE1881d LANDED

Landed in mainline as a083fadf540d on 2021-08-18.

2 messages, 2 authors, 2021-08-17 · open the first message on its own page

[PATCH] dt-bindings: PCI: faraday,ftpci100: Fix 'contains' schema usage

From: Rob Herring <robh@kernel.org>
Date: 2021-08-17 17:47:49

The 'contains' keyword applies to elements within an array, so
using 'items' only makes sense if the elements of the array are another
array which is not the case for 'compatible' properties.

Looking at the driver, it seems the intent was the condition should be
true when 'faraday,ftpci100' is present, so we can drop
'cortina,gemini-pci'.

Fixes: 2720b991337d ("dt-bindings: PCI: ftpci100: convert faraday,ftpci100 to YAML")
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Linus Walleij <redacted>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
---
 Documentation/devicetree/bindings/pci/faraday,ftpci100.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/pci/faraday,ftpci100.yaml b/Documentation/devicetree/bindings/pci/faraday,ftpci100.yaml
index fb32f7b55035..92efbf0f1297 100644
--- a/Documentation/devicetree/bindings/pci/faraday,ftpci100.yaml
+++ b/Documentation/devicetree/bindings/pci/faraday,ftpci100.yaml
@@ -113,9 +113,7 @@ if:
   properties:
     compatible:
       contains:
-        items:
-          - const: cortina,gemini-pci
-          - const: faraday,ftpci100
+        const: faraday,ftpci100
 then:
   required:
     - interrupt-controller
-- 
2.30.2

Re: [PATCH] dt-bindings: PCI: faraday,ftpci100: Fix 'contains' schema usage

From: Linus Walleij <hidden>
Date: 2021-08-17 20:28:09

On Tue, Aug 17, 2021 at 7:47 PM Rob Herring [off-list ref] wrote:
The 'contains' keyword applies to elements within an array, so
using 'items' only makes sense if the elements of the array are another
array which is not the case for 'compatible' properties.

Looking at the driver, it seems the intent was the condition should be
true when 'faraday,ftpci100' is present, so we can drop
'cortina,gemini-pci'.

Fixes: 2720b991337d ("dt-bindings: PCI: ftpci100: convert faraday,ftpci100 to YAML")
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Linus Walleij <redacted>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Linus Walleij <redacted>

Yours,
Linus Walleij
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help