* [PATCH 1/2] dt-bindings: usb: generic-ehci: Add missing compatible strings
@ 2021-02-02 17:54 Rob Herring
2021-02-02 17:54 ` [PATCH 2/2] dt-bindings: usb: generic-ohci: " Rob Herring
0 siblings, 1 reply; 5+ messages in thread
From: Rob Herring @ 2021-02-02 17:54 UTC (permalink / raw)
To: devicetree; +Cc: linux-kernel, Greg Kroah-Hartman, linux-usb
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.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
---
.../devicetree/bindings/usb/generic-ehci.yaml | 51 +++++++++++++++++--
1 file changed, 48 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/generic-ehci.yaml b/Documentation/devicetree/bindings/usb/generic-ehci.yaml
index 247ef00381ea..6816de7dfc00 100644
--- a/Documentation/devicetree/bindings/usb/generic-ehci.yaml
+++ b/Documentation/devicetree/bindings/usb/generic-ehci.yaml
@@ -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>;
--
2.27.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] dt-bindings: usb: generic-ohci: Add missing compatible strings
2021-02-02 17:54 [PATCH 1/2] dt-bindings: usb: generic-ehci: Add missing compatible strings Rob Herring
@ 2021-02-02 17:54 ` Rob Herring
2021-02-03 9:07 ` Greg Kroah-Hartman
0 siblings, 1 reply; 5+ messages in thread
From: Rob Herring @ 2021-02-02 17:54 UTC (permalink / raw)
To: devicetree; +Cc: linux-kernel, Greg Kroah-Hartman, linux-usb
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.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
---
.../devicetree/bindings/usb/generic-ohci.yaml | 34 +++++++++++++++++--
1 file changed, 32 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/generic-ohci.yaml b/Documentation/devicetree/bindings/usb/generic-ohci.yaml
index 2178bcc401bc..53df281f618c 100644
--- a/Documentation/devicetree/bindings/usb/generic-ohci.yaml
+++ b/Documentation/devicetree/bindings/usb/generic-ohci.yaml
@@ -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
--
2.27.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] dt-bindings: usb: generic-ohci: Add missing compatible strings
2021-02-02 17:54 ` [PATCH 2/2] dt-bindings: usb: generic-ohci: " Rob Herring
@ 2021-02-03 9:07 ` Greg Kroah-Hartman
2021-02-03 21:08 ` Rob Herring
0 siblings, 1 reply; 5+ messages in thread
From: Greg Kroah-Hartman @ 2021-02-03 9:07 UTC (permalink / raw)
To: Rob Herring; +Cc: devicetree, linux-kernel, linux-usb
On Tue, Feb 02, 2021 at 11:54:39AM -0600, Rob Herring wrote:
> 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.
>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: linux-usb@vger.kernel.org
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> .../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:
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
If not, just let me know and I will pick them up.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] dt-bindings: usb: generic-ohci: Add missing compatible strings
2021-02-03 9:07 ` Greg Kroah-Hartman
@ 2021-02-03 21:08 ` Rob Herring
2021-02-03 23:50 ` Greg Kroah-Hartman
0 siblings, 1 reply; 5+ messages in thread
From: Rob Herring @ 2021-02-03 21:08 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: devicetree, linux-kernel, linux-usb
On Wed, Feb 03, 2021 at 10:07:47AM +0100, Greg Kroah-Hartman wrote:
> On Tue, Feb 02, 2021 at 11:54:39AM -0600, Rob Herring wrote:
> > 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.
> >
> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > Cc: linux-usb@vger.kernel.org
> > Signed-off-by: Rob Herring <robh@kernel.org>
> > ---
> > .../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?
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] dt-bindings: usb: generic-ohci: Add missing compatible strings
2021-02-03 21:08 ` Rob Herring
@ 2021-02-03 23:50 ` Greg Kroah-Hartman
0 siblings, 0 replies; 5+ messages in thread
From: Greg Kroah-Hartman @ 2021-02-03 23:50 UTC (permalink / raw)
To: Rob Herring; +Cc: devicetree, linux-kernel, linux-usb
On Wed, Feb 03, 2021 at 03:08:34PM -0600, Rob Herring wrote:
> On Wed, Feb 03, 2021 at 10:07:47AM +0100, Greg Kroah-Hartman wrote:
> > On Tue, Feb 02, 2021 at 11:54:39AM -0600, Rob Herring wrote:
> > > 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.
> > >
> > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > Cc: linux-usb@vger.kernel.org
> > > Signed-off-by: Rob Herring <robh@kernel.org>
> > > ---
> > > .../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?
>
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-02-03 23:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-02 17:54 [PATCH 1/2] dt-bindings: usb: generic-ehci: Add missing compatible strings Rob Herring
2021-02-02 17:54 ` [PATCH 2/2] dt-bindings: usb: generic-ohci: " Rob Herring
2021-02-03 9:07 ` Greg Kroah-Hartman
2021-02-03 21:08 ` Rob Herring
2021-02-03 23:50 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).