All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rob Herring <robh@kernel.org>
To: devicetree@vger.kernel.org
Cc: linux-clk@vger.kernel.org, linux-usb@vger.kernel.org,
	linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Mark Brown <broonie@kernel.org>
Subject: [PATCH 2/5] dt-bindings: usb: ehci: Add missing 2nd register region
Date: Tue, 12 May 2020 15:45:40 -0500	[thread overview]
Message-ID: <20200512204543.22090-2-robh@kernel.org> (raw)
In-Reply-To: <20200512204543.22090-1-robh@kernel.org>

The 'ibm,usb-ehci-440epx' compatible has a 2nd 'reg' region, but the
schema says there is only 1 region. Fix this.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
---
Please ack, dependency for patch 5.

 .../devicetree/bindings/usb/generic-ehci.yaml | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/usb/generic-ehci.yaml b/Documentation/devicetree/bindings/usb/generic-ehci.yaml
index 848eea59bc00..37a818d72a74 100644
--- a/Documentation/devicetree/bindings/usb/generic-ehci.yaml
+++ b/Documentation/devicetree/bindings/usb/generic-ehci.yaml
@@ -6,19 +6,30 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 
 title: USB EHCI Controller Device Tree Bindings
 
-allOf:
-  - $ref: "usb-hcd.yaml"
-
 maintainers:
   - Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
+allOf:
+  - $ref: "usb-hcd.yaml"
+  - if:
+      properties:
+        compatible:
+          not:
+            contains:
+              const: ibm,usb-ehci-440epx
+    then:
+      properties:
+        reg:
+          maxItems: 1
+
 properties:
   compatible:
     contains:
       const: generic-ehci
 
   reg:
-    maxItems: 1
+    minItems: 1
+    maxItems: 2
 
   interrupts:
     maxItems: 1
-- 
2.20.1


  reply	other threads:[~2020-05-12 20:45 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-12 20:45 [PATCH 1/5] spi: dt-bindings: sifive: Add missing 2nd register region Rob Herring
2020-05-12 20:45 ` Rob Herring
2020-05-12 20:45 ` Rob Herring [this message]
2020-05-13 12:05   ` [PATCH 2/5] dt-bindings: usb: ehci: " Greg Kroah-Hartman
2020-05-12 20:45 ` [PATCH 3/5] dt-bindings: ufs: ti: Fix address properties handling Rob Herring
2020-05-13  7:49   ` Vignesh Raghavendra
2020-05-12 20:45 ` [PATCH 4/5] dt-bindings: ufs: ti: Add missing 'additionalProperties: false' Rob Herring
2020-05-13  7:49   ` Vignesh Raghavendra
2020-05-12 20:45 ` [PATCH 5/5] dt-bindings: Fix incorrect 'reg' property sizes Rob Herring
2020-05-12 21:46   ` Stephen Boyd
2020-05-13  7:04   ` Geert Uytterhoeven
2020-05-13 12:10 ` [PATCH 1/5] spi: dt-bindings: sifive: Add missing 2nd register region Mark Brown
2020-05-13 12:10   ` Mark Brown
2020-05-13 13:02   ` Rob Herring
2020-05-13 13:02     ` Rob Herring
2020-05-13 14:03     ` Mark Brown
2020-05-13 14:03       ` Mark Brown
2020-05-13 21:22 ` Paul Walmsley
2020-05-13 21:22   ` Paul Walmsley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200512204543.22090-2-robh@kernel.org \
    --to=robh@kernel.org \
    --cc=broonie@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-spi@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.