diff mbox series

[v2,37/52] dt-bindings: usb: dwc3: Fix usb-phy check

Message ID 20210901091852.479202-38-maxime@cerno.tech
State Accepted
Commit a8e2908cae1120eda39d534f23523082dac6b96d
Headers show
Series ARM: dts: Last round of DT schema fixes | expand

Commit Message

Maxime Ripard Sept. 1, 2021, 9:18 a.m. UTC
The original binding was allowing any combination of usb2-phy and
usb3-phy in the phys and phy-names properties.

However, the current binding enforces that those properties must be a
list of usb2-phy and usb3-phy, with exactly one element, effectively
making usb2-phy the only value being valid.

Let's rework the properties description to allow either one or two
element picked with values either usb2-phy or usb3-phy. The rest of the
tooling makes sure that we don't get any duplicate value, so this should
be what we want.

Cc: Felipe Balbi <balbi@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
 Documentation/devicetree/bindings/usb/snps,dwc3.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Rob Herring Sept. 3, 2021, 7:49 p.m. UTC | #1
On Wed, Sep 01, 2021 at 03:36:35PM +0300, Felipe Balbi wrote:
> 

> Maxime Ripard <maxime@cerno.tech> writes:

> 

> > The original binding was allowing any combination of usb2-phy and

> > usb3-phy in the phys and phy-names properties.

> >

> > However, the current binding enforces that those properties must be a

> > list of usb2-phy and usb3-phy, with exactly one element, effectively

> > making usb2-phy the only value being valid.

> >

> > Let's rework the properties description to allow either one or two

> > element picked with values either usb2-phy or usb3-phy. The rest of the

> > tooling makes sure that we don't get any duplicate value, so this should

> > be what we want.

> >

> > Cc: Felipe Balbi <balbi@kernel.org>

> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

> > Cc: linux-usb@vger.kernel.org

> > Signed-off-by: Maxime Ripard <maxime@cerno.tech>

> > ---

> >  Documentation/devicetree/bindings/usb/snps,dwc3.yaml | 10 +++++-----

> >  1 file changed, 5 insertions(+), 5 deletions(-)

> >

> > diff --git a/Documentation/devicetree/bindings/usb/snps,dwc3.yaml b/Documentation/devicetree/bindings/usb/snps,dwc3.yaml

> > index 078fb7889593..c1c970073681 100644

> > --- a/Documentation/devicetree/bindings/usb/snps,dwc3.yaml

> > +++ b/Documentation/devicetree/bindings/usb/snps,dwc3.yaml

> > @@ -73,15 +73,15 @@ properties:

> >  

> >    phys:

> >      minItems: 1

> > -    items:

> > -      - description: USB2/HS PHY

> > -      - description: USB3/SS PHY

> > +    maxItems: 2

> 

> I'm not sure you should enforce a maximum of 2 PHYs. Some systems may

> use more than one USB2 PHY to take care of different parts of the USB

> link.


It was already limited to 2. This change doesn't change that.

Rob
Rob Herring Sept. 3, 2021, 7:50 p.m. UTC | #2
On Wed, 01 Sep 2021 11:18:37 +0200, Maxime Ripard wrote:
> The original binding was allowing any combination of usb2-phy and

> usb3-phy in the phys and phy-names properties.

> 

> However, the current binding enforces that those properties must be a

> list of usb2-phy and usb3-phy, with exactly one element, effectively

> making usb2-phy the only value being valid.

> 

> Let's rework the properties description to allow either one or two

> element picked with values either usb2-phy or usb3-phy. The rest of the

> tooling makes sure that we don't get any duplicate value, so this should

> be what we want.

> 

> Cc: Felipe Balbi <balbi@kernel.org>

> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

> Cc: linux-usb@vger.kernel.org

> Signed-off-by: Maxime Ripard <maxime@cerno.tech>

> ---

>  Documentation/devicetree/bindings/usb/snps,dwc3.yaml | 10 +++++-----

>  1 file changed, 5 insertions(+), 5 deletions(-)

> 


Reviewed-by: Rob Herring <robh@kernel.org>
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/usb/snps,dwc3.yaml b/Documentation/devicetree/bindings/usb/snps,dwc3.yaml
index 078fb7889593..c1c970073681 100644
--- a/Documentation/devicetree/bindings/usb/snps,dwc3.yaml
+++ b/Documentation/devicetree/bindings/usb/snps,dwc3.yaml
@@ -73,15 +73,15 @@  properties:
 
   phys:
     minItems: 1
-    items:
-      - description: USB2/HS PHY
-      - description: USB3/SS PHY
+    maxItems: 2
 
   phy-names:
     minItems: 1
+    maxItems: 2
     items:
-      - const: usb2-phy
-      - const: usb3-phy
+      enum:
+        - usb2-phy
+        - usb3-phy
 
   resets:
     minItems: 1