Skip to contentSkip to conversation

dt-bindings: usb: generic-ehci: Add missing compatible strings

PATCH In review Rob Herring 2 participants 5 messages Feb 2, 2021 – Feb 3, 2021

Subsystems (2)
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/2 dt-bindings: usb: generic-ehci: Add missing compatible strings

The generic EHCI binding needs to document all the specific compatible strings so we can track undocumented compatible strings. Add all the compatible strings from in tree users.

Turns out we also have the generic 'usb-ehci' compatible which is pretty much the same binding and the correct one for the example, so let's add it.

---
 .../devicetree/bindings/usb/generic-ehci.yaml | 51 +++++++++++++++++--
 1 file changed, 48 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/usb/generic-ehci.yaml +48 -3
index 247ef00381ea..6816de7dfc00 100644
@@ -24,8 +24,53 @@ allOf:
 
 properties:
   compatible:
-    contains:
-      const: generic-ehci
+    oneOf:
+      - items:
+          - enum:
+              - allwinner,sun4i-a10-ehci
+              - allwinner,sun50i-a64-ehci
+              - allwinner,sun50i-h6-ehci
+              - allwinner,sun5i-a13-ehci
+              - allwinner,sun6i-a31-ehci
+              - allwinner,sun7i-a20-ehci
+              - allwinner,sun8i-a23-ehci
+              - allwinner,sun8i-h3-ehci
+              - allwinner,sun8i-r40-ehci
+              - allwinner,sun9i-a80-ehci
+              - aspeed,ast2400-ehci
+              - aspeed,ast2500-ehci
+              - aspeed,ast2600-ehci
+              - brcm,bcm3384-ehci
+              - brcm,bcm63268-ehci
+              - brcm,bcm6328-ehci
+              - brcm,bcm6358-ehci
+              - brcm,bcm6362-ehci
+              - brcm,bcm6368-ehci
+              - brcm,bcm7125-ehci
+              - brcm,bcm7346-ehci
+              - brcm,bcm7358-ehci
+              - brcm,bcm7360-ehci
+              - brcm,bcm7362-ehci
+              - brcm,bcm7420-ehci
+              - brcm,bcm7425-ehci
+              - brcm,bcm7435-ehci
+              - ibm,476gtr-ehci
+              - nxp,lpc1850-ehci
+              - qca,ar7100-ehci
+              - snps,hsdk-v1.0-ehci
+              - socionext,uniphier-ehci
+          - const: generic-ehci
+      - items:
+          - enum:
+              - cavium,octeon-6335-ehci
+              - ibm,usb-ehci-440epx
+              - ibm,usb-ehci-460ex
+              - nintendo,hollywood-usb-ehci
+              - st,spear600-ehci
+          - const: usb-ehci
+      - enum:
+          - generic-ehci
+          - usb-ehci
 
   reg:
     minItems: 1
@@ -101,7 +146,7 @@ additionalProperties: false
 examples:
   - |
     usb@e0000300 {
-        compatible = "ibm,usb-ehci-440epx", "generic-ehci";
+        compatible = "ibm,usb-ehci-440epx", "usb-ehci";
         interrupt-parent = <&UIC0>;
         interrupts = <0x1a 4>;
         reg = <0xe0000300 90>, <0xe0000390 70>;
Signature · 1 line
2.27.0
author maintainer
#1 lore raw

PATCH 2/2 dt-bindings: usb: generic-ohci: Add missing compatible strings

The generic OHCI binding needs to document all the specific compatible strings so we can track undocumented compatible strings. Add all the compatible strings from in tree users.

---
 .../devicetree/bindings/usb/generic-ohci.yaml | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/usb/generic-ohci.yaml +32 -2
index 2178bcc401bc..53df281f618c 100644
@@ -14,8 +14,38 @@ maintainers:
 
 properties:
   compatible:
-    contains:
-      const: generic-ohci
+    oneOf:
+      - items:
+          - enum:
+              - allwinner,sun4i-a10-ohci
+              - allwinner,sun50i-a64-ohci
+              - allwinner,sun50i-h6-ohci
+              - allwinner,sun5i-a13-ohci
+              - allwinner,sun6i-a31-ohci
+              - allwinner,sun7i-a20-ohci
+              - allwinner,sun8i-a23-ohci
+              - allwinner,sun8i-h3-ohci
+              - allwinner,sun8i-r40-ohci
+              - allwinner,sun9i-a80-ohci
+              - brcm,bcm3384-ohci
+              - brcm,bcm63268-ohci
+              - brcm,bcm6328-ohci
+              - brcm,bcm6358-ohci
+              - brcm,bcm6362-ohci
+              - brcm,bcm6368-ohci
+              - brcm,bcm7125-ohci
+              - brcm,bcm7346-ohci
+              - brcm,bcm7358-ohci
+              - brcm,bcm7360-ohci
+              - brcm,bcm7362-ohci
+              - brcm,bcm7420-ohci
+              - brcm,bcm7425-ohci
+              - brcm,bcm7435-ohci
+              - ibm,476gtr-ohci
+              - ingenic,jz4740-ohci
+              - snps,hsdk-v1.0-ohci
+          - const: generic-ohci
+      - const: generic-ohci
 
   reg:
     maxItems: 1
Signature · 1 line
2.27.0
maintainer Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] dt-bindings: usb: generic-ohci: Add missing compatible strings

Quoted 10 lines · Rob Herring

The generic OHCI binding needs to document all the specific compatible strings so we can track undocumented compatible strings. Add all the compatible strings from in tree users.

---
 .../devicetree/bindings/usb/generic-ohci.yaml | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

Both look fine to me, do you want me to take this through my trees or will you take them?

If you want to, fine with me:

If not, just let me know and I will pick them up.

thanks,

greg k-h

author maintainer
#3 lore raw

Re: [PATCH 2/2] dt-bindings: usb: generic-ohci: Add missing compatible strings

Quoted 12 lines · Greg Kroah-Hartman
Quoted 10 lines · Rob Herring

The generic OHCI binding needs to document all the specific compatible strings so we can track undocumented compatible strings. Add all the compatible strings from in tree users.

---
 .../devicetree/bindings/usb/generic-ohci.yaml | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)
Quoted 2 lines

Both look fine to me, do you want me to take this through my trees or will you take them?

You'd better take them. I don't think they conflict with any of the other USB binding changes, but there have been a few this cycle IIRC.

Rob

#4 lore raw

Re: [PATCH 2/2] dt-bindings: usb: generic-ohci: Add missing compatible strings

Quoted 13 lines · Rob Herring
Quoted 12 lines · Greg Kroah-Hartman
Quoted 10 lines · Rob Herring

The generic OHCI binding needs to document all the specific compatible strings so we can track undocumented compatible strings. Add all the compatible strings from in tree users.

---
 .../devicetree/bindings/usb/generic-ohci.yaml | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)
Quoted 5 lines
Quoted 2 lines

Both look fine to me, do you want me to take this through my trees or will you take them?

You'd better take them. I don't think they conflict with any of the other USB binding changes, but there have been a few this cycle IIRC.

Ok, now queued up, thanks!

greg k-h