[PATCHv1 0/3] generic-ohci/ehci: add RK3588 support

[PATCHv1 0/3] generic-ohci/ehci: add RK3588 support

[Sebastian Reichel]

Hi,

This increases the max. allowed clocks for generic-ohci from 3 to 4.
On RK3588 a total of 4 clocks is required to access the OHCI registers.
EHCI already supports 4 clocks.

Changes since PATCHv1:
 * https://lore.kernel.org/all/20230331163148.5863-1-sebastian.reichel@collabora.com/
 * Add Alan's Acked-by to the driver patch increasing the clock count
 * Update bindings, adding rockchip,rk3588-ohci and rockchip,rk3588-ehci compatibles

-- Sebastian

Sebastian Reichel (3):
  dt-bindings: usb: Add RK3588 OHCI
  dt-bindings: usb: Add RK3588 EHCI
  usb: host: ohci-platform: increase max clock number to 4

 .../devicetree/bindings/usb/generic-ehci.yaml  |  1 +
 .../devicetree/bindings/usb/generic-ohci.yaml  | 18 ++++++++++++++++--
 drivers/usb/host/ohci-platform.c               |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

-- 
2.39.2

[PATCHv1 1/3] dt-bindings: usb: Add RK3588 OHCI

[Sebastian Reichel]

Add compatible for RK3588 OHCI. As far as I know it's fully
compatible with generic-ohci.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 .../devicetree/bindings/usb/generic-ohci.yaml  | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/usb/generic-ohci.yaml b/Documentation/devicetree/bindings/usb/generic-ohci.yaml
index a9ba7257b884..d84732a100ba 100644
--- a/Documentation/devicetree/bindings/usb/generic-ohci.yaml
+++ b/Documentation/devicetree/bindings/usb/generic-ohci.yaml
@@ -44,6 +44,7 @@ properties:
               - hpe,gxp-ohci
               - ibm,476gtr-ohci
               - ingenic,jz4740-ohci
+              - rockchip,rk3588-ohci
               - snps,hsdk-v1.0-ohci
           - const: generic-ohci
       - enum:
@@ -68,8 +69,6 @@ properties:
     maxItems: 2
 
   clocks:
-    minItems: 1
-    maxItems: 3
     description: |
       In case the Renesas R-Car Gen3 SoCs:
         - if a host only channel: first clock should be host.
@@ -147,6 +146,21 @@ allOf:
     then:
       properties:
         transceiver: false
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: rockchip,rk3588-ohci
+    then:
+      properties:
+        clocks:
+          minItems: 4
+          maxItems: 4
+    else:
+      properties:
+        clocks:
+          minItems: 1
+          maxItems: 3
 
 additionalProperties: false
 
-- 
2.39.2

[PATCHv1 2/3] dt-bindings: usb: Add RK3588 EHCI

[Sebastian Reichel]

Add compatible for RK3588 EHCI. As far as I know it's fully
compatible with generic-ehci.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 Documentation/devicetree/bindings/usb/generic-ehci.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/usb/generic-ehci.yaml b/Documentation/devicetree/bindings/usb/generic-ehci.yaml
index 050cfd5acdaa..01bfbc6ded5c 100644
--- a/Documentation/devicetree/bindings/usb/generic-ehci.yaml
+++ b/Documentation/devicetree/bindings/usb/generic-ehci.yaml
@@ -61,6 +61,7 @@ properties:
               - ibm,476gtr-ehci
               - nxp,lpc1850-ehci
               - qca,ar7100-ehci
+              - rockchip,rk3588-ehci
               - snps,hsdk-v1.0-ehci
               - socionext,uniphier-ehci
           - const: generic-ehci
-- 
2.39.2

[PATCHv1 3/3] usb: host: ohci-platform: increase max clock number to 4

[Sebastian Reichel]

Rockchip RK3588 OHCI requires 4 clocks to be enabled.

Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 drivers/usb/host/ohci-platform.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c
index a84305091c43..dec38a845cff 100644
--- a/drivers/usb/host/ohci-platform.c
+++ b/drivers/usb/host/ohci-platform.c
@@ -33,7 +33,7 @@
 #include "ohci.h"
 
 #define DRIVER_DESC "OHCI generic platform driver"
-#define OHCI_MAX_CLKS 3
+#define OHCI_MAX_CLKS 4
 #define hcd_to_ohci_priv(h) ((struct ohci_platform_priv *)hcd_to_ohci(h)->priv)
 
 struct ohci_platform_priv {
-- 
2.39.2

Re: [PATCHv1 0/3] generic-ohci/ehci: add RK3588 support

[Greg Kroah-Hartman]

On Tue, Apr 04, 2023 at 04:53:47PM +0200, Sebastian Reichel wrote:
> Hi,
> 
> This increases the max. allowed clocks for generic-ohci from 3 to 4.
> On RK3588 a total of 4 clocks is required to access the OHCI registers.
> EHCI already supports 4 clocks.
> 
> Changes since PATCHv1:
>  * https://lore.kernel.org/all/20230331163148.5863-1-sebastian.reichel@collabora.com/
>  * Add Alan's Acked-by to the driver patch increasing the clock count
>  * Update bindings, adding rockchip,rk3588-ohci and rockchip,rk3588-ehci compatibles

This is "v1" according to the subject line, right?

confused,

greg k-h

Re: [PATCHv1 0/3] generic-ohci/ehci: add RK3588 support

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]

Hi Greg,

On Wed, Apr 05, 2023 at 04:49:37PM +0200, Greg Kroah-Hartman wrote:
> On Tue, Apr 04, 2023 at 04:53:47PM +0200, Sebastian Reichel wrote:
> > Hi,
> > 
> > This increases the max. allowed clocks for generic-ohci from 3 to 4.
> > On RK3588 a total of 4 clocks is required to access the OHCI registers.
> > EHCI already supports 4 clocks.
> > 
> > Changes since PATCHv1:
> >  * https://lore.kernel.org/all/20230331163148.5863-1-sebastian.reichel@collabora.com/
> >  * Add Alan's Acked-by to the driver patch increasing the clock count
> >  * Update bindings, adding rockchip,rk3588-ohci and rockchip,rk3588-ehci compatibles
> 
> This is "v1" according to the subject line, right?

Well the previous version was also about adding RK3588 support.
I did not see anything RK3588 specific and thus used "increase
allowed clocks" as subject for the cover letter. Rob's review
effectively asked for RK3588 specific compatibles to be added,
so this is a v2 of the series with that change included.

Since increasing the maximum number of clocks is no longer the
dominant content of the series I changed the cover letter's
subject. Sorry that this confused you.

Greetings,

-- Sebastian

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCHv1 1/3] dt-bindings: usb: Add RK3588 OHCI

[Krzysztof Kozlowski]

On 04/04/2023 16:53, Sebastian Reichel wrote:
> Add compatible for RK3588 OHCI. As far as I know it's fully
> compatible with generic-ohci.
> 
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> ---
>  .../devicetree/bindings/usb/generic-ohci.yaml  | 18 ++++++++++++++++--
>  1 file changed, 16 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/usb/generic-ohci.yaml b/Documentation/devicetree/bindings/usb/generic-ohci.yaml
> index a9ba7257b884..d84732a100ba 100644
> --- a/Documentation/devicetree/bindings/usb/generic-ohci.yaml
> +++ b/Documentation/devicetree/bindings/usb/generic-ohci.yaml
> @@ -44,6 +44,7 @@ properties:
>                - hpe,gxp-ohci
>                - ibm,476gtr-ohci
>                - ingenic,jz4740-ohci
> +              - rockchip,rk3588-ohci
>                - snps,hsdk-v1.0-ohci
>            - const: generic-ohci
>        - enum:
> @@ -68,8 +69,6 @@ properties:
>      maxItems: 2
>  
>    clocks:
> -    minItems: 1
> -    maxItems: 3

The constraints here should stay.

Best regards,
Krzysztof

Re: [PATCHv1 2/3] dt-bindings: usb: Add RK3588 EHCI

[Krzysztof Kozlowski]

On 04/04/2023 16:53, Sebastian Reichel wrote:
> Add compatible for RK3588 EHCI. As far as I know it's fully
> compatible with generic-ehci.
> 
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>


Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: [PATCHv1 1/3] dt-bindings: usb: Add RK3588 OHCI

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 1395 bytes --]

Hi Krzysztof,

On Thu, Apr 06, 2023 at 09:45:11AM +0200, Krzysztof Kozlowski wrote:
> On 04/04/2023 16:53, Sebastian Reichel wrote:
> > Add compatible for RK3588 OHCI. As far as I know it's fully
> > compatible with generic-ohci.
> > 
> > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> > ---
> >  .../devicetree/bindings/usb/generic-ohci.yaml  | 18 ++++++++++++++++--
> >  1 file changed, 16 insertions(+), 2 deletions(-)
> > 
> > diff --git a/Documentation/devicetree/bindings/usb/generic-ohci.yaml b/Documentation/devicetree/bindings/usb/generic-ohci.yaml
> > index a9ba7257b884..d84732a100ba 100644
> > --- a/Documentation/devicetree/bindings/usb/generic-ohci.yaml
> > +++ b/Documentation/devicetree/bindings/usb/generic-ohci.yaml
> > @@ -44,6 +44,7 @@ properties:
> >                - hpe,gxp-ohci
> >                - ibm,476gtr-ohci
> >                - ingenic,jz4740-ohci
> > +              - rockchip,rk3588-ohci
> >                - snps,hsdk-v1.0-ohci
> >            - const: generic-ohci
> >        - enum:
> > @@ -68,8 +69,6 @@ properties:
> >      maxItems: 2
> >  
> >    clocks:
> > -    minItems: 1
> > -    maxItems: 3
> 
> The constraints here should stay.

dtbs_check complained about the 4 RK3588 clock entries if this
stays. That's why I moved them to the condition down below into
the else branch.

-- Sebastian

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCHv1 1/3] dt-bindings: usb: Add RK3588 OHCI

[Krzysztof Kozlowski]

On 06/04/2023 12:51, Sebastian Reichel wrote:
> Hi Krzysztof,
> 
> On Thu, Apr 06, 2023 at 09:45:11AM +0200, Krzysztof Kozlowski wrote:
>> On 04/04/2023 16:53, Sebastian Reichel wrote:
>>> Add compatible for RK3588 OHCI. As far as I know it's fully
>>> compatible with generic-ohci.
>>>
>>> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
>>> ---
>>>  .../devicetree/bindings/usb/generic-ohci.yaml  | 18 ++++++++++++++++--
>>>  1 file changed, 16 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/Documentation/devicetree/bindings/usb/generic-ohci.yaml b/Documentation/devicetree/bindings/usb/generic-ohci.yaml
>>> index a9ba7257b884..d84732a100ba 100644
>>> --- a/Documentation/devicetree/bindings/usb/generic-ohci.yaml
>>> +++ b/Documentation/devicetree/bindings/usb/generic-ohci.yaml
>>> @@ -44,6 +44,7 @@ properties:
>>>                - hpe,gxp-ohci
>>>                - ibm,476gtr-ohci
>>>                - ingenic,jz4740-ohci
>>> +              - rockchip,rk3588-ohci
>>>                - snps,hsdk-v1.0-ohci
>>>            - const: generic-ohci
>>>        - enum:
>>> @@ -68,8 +69,6 @@ properties:
>>>      maxItems: 2
>>>  
>>>    clocks:
>>> -    minItems: 1
>>> -    maxItems: 3
>>
>> The constraints here should stay.
> 
> dtbs_check complained about the 4 RK3588 clock entries if this
> stays. That's why I moved them to the condition down below into
> the else branch.

Which is not what we want. We want the constraints here (the widest).

Best regards,
Krzysztof

Re: [PATCHv1 1/3] dt-bindings: usb: Add RK3588 OHCI

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 711 bytes --]

Hi,

On Thu, Apr 06, 2023 at 01:02:44PM +0200, Krzysztof Kozlowski wrote:
> On 06/04/2023 12:51, Sebastian Reichel wrote:
> >>>    clocks:
> >>> -    minItems: 1
> >>> -    maxItems: 3
> >>
> >> The constraints here should stay.
> > 
> > dtbs_check complained about the 4 RK3588 clock entries if this
> > stays. That's why I moved them to the condition down below into
> > the else branch.
> 
> Which is not what we want. We want the constraints here (the widest).

So it should look like this?

clocks:
    minItems: 1
    maxItems: 4

...

if rk3588:
    clocks:
        minItems: 4
        maxItems: 4
else:
    clocks:
        minItems: 1
        maxItems: 3

-- Sebastian

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCHv1 1/3] dt-bindings: usb: Add RK3588 OHCI

[Krzysztof Kozlowski]

On 06/04/2023 14:33, Sebastian Reichel wrote:
> Hi,
> 
> On Thu, Apr 06, 2023 at 01:02:44PM +0200, Krzysztof Kozlowski wrote:
>> On 06/04/2023 12:51, Sebastian Reichel wrote:
>>>>>    clocks:
>>>>> -    minItems: 1
>>>>> -    maxItems: 3
>>>>
>>>> The constraints here should stay.
>>>
>>> dtbs_check complained about the 4 RK3588 clock entries if this
>>> stays. That's why I moved them to the condition down below into
>>> the else branch.
>>
>> Which is not what we want. We want the constraints here (the widest).
> 
> So it should look like this?
> 
> clocks:
>     minItems: 1
>     maxItems: 4
> 

Yes.

Best regards,
Krzysztof

Re: [PATCHv1 1/3] dt-bindings: usb: Add RK3588 OHCI

[Rob Herring]

On Thu, Apr 06, 2023 at 03:55:50PM +0200, Sebastian Reichel wrote:
> Add compatible for RK3588 OHCI. As far as I know it's fully
> compatible with generic-ohci.
> 
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> ---
>  .../devicetree/bindings/usb/generic-ohci.yaml  | 18 +++++++++++++++++-
>  1 file changed, 17 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/usb/generic-ohci.yaml b/Documentation/devicetree/bindings/usb/generic-ohci.yaml
> index a9ba7257b884..e116ed90471e 100644
> --- a/Documentation/devicetree/bindings/usb/generic-ohci.yaml
> +++ b/Documentation/devicetree/bindings/usb/generic-ohci.yaml
> @@ -44,6 +44,7 @@ properties:
>                - hpe,gxp-ohci
>                - ibm,476gtr-ohci
>                - ingenic,jz4740-ohci
> +              - rockchip,rk3588-ohci
>                - snps,hsdk-v1.0-ohci
>            - const: generic-ohci
>        - enum:
> @@ -69,7 +70,7 @@ properties:
>  
>    clocks:
>      minItems: 1
> -    maxItems: 3
> +    maxItems: 4
>      description: |
>        In case the Renesas R-Car Gen3 SoCs:
>          - if a host only channel: first clock should be host.
> @@ -147,6 +148,21 @@ allOf:
>      then:
>        properties:
>          transceiver: false
> +  - if:
> +      properties:
> +        compatible:
> +          contains:
> +            const: rockchip,rk3588-ohci
> +    then:
> +      properties:
> +        clocks:
> +          minItems: 4
> +          maxItems: 4

Only need minItems here.

> +    else:
> +      properties:
> +        clocks:
> +          minItems: 1
> +          maxItems: 3

Only need maxItems here.

With that,

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

[PATCHv1 1/3] dt-bindings: usb: Add RK3588 OHCI

[Sebastian Reichel]

Add compatible for RK3588 OHCI. As far as I know it's fully
compatible with generic-ohci.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 .../devicetree/bindings/usb/generic-ohci.yaml  | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/usb/generic-ohci.yaml b/Documentation/devicetree/bindings/usb/generic-ohci.yaml
index a9ba7257b884..e116ed90471e 100644
--- a/Documentation/devicetree/bindings/usb/generic-ohci.yaml
+++ b/Documentation/devicetree/bindings/usb/generic-ohci.yaml
@@ -44,6 +44,7 @@ properties:
               - hpe,gxp-ohci
               - ibm,476gtr-ohci
               - ingenic,jz4740-ohci
+              - rockchip,rk3588-ohci
               - snps,hsdk-v1.0-ohci
           - const: generic-ohci
       - enum:
@@ -69,7 +70,7 @@ properties:
 
   clocks:
     minItems: 1
-    maxItems: 3
+    maxItems: 4
     description: |
       In case the Renesas R-Car Gen3 SoCs:
         - if a host only channel: first clock should be host.
@@ -147,6 +148,21 @@ allOf:
     then:
       properties:
         transceiver: false
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: rockchip,rk3588-ohci
+    then:
+      properties:
+        clocks:
+          minItems: 4
+          maxItems: 4
+    else:
+      properties:
+        clocks:
+          minItems: 1
+          maxItems: 3
 
 additionalProperties: false
 
-- 
2.39.2