diff mbox series

[4/4] arm64: dts: renesas: r9a07g0{43,44,54}: Update usbhs family compatible

Message ID 20240308180919.6603-5-biju.das.jz@bp.renesas.com (mailing list archive)
State Superseded
Delegated to: Geert Uytterhoeven
Headers show
Series Fix USB pipe configuration for RZ/G2L | expand

Commit Message

Biju Das March 8, 2024, 6:09 p.m. UTC
Replace 'renesas,rza2m-usbhs->renesas,rzg2l-usbhs' as family compatible
for RZ/G2L family SOCs as there is a difference in number of pipe
buffers compared to RZ/A2M.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
 arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 2 +-
 arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 2 +-
 arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Krzysztof Kozlowski March 9, 2024, 12:08 p.m. UTC | #1
On 08/03/2024 19:09, Biju Das wrote:
> Replace 'renesas,rza2m-usbhs->renesas,rzg2l-usbhs' as family compatible
> for RZ/G2L family SOCs as there is a difference in number of pipe
> buffers compared to RZ/A2M.
> 
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> ---
>  arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 2 +-
>  arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 2 +-
>  arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> index 8721f4c9fa0f..766c54b91acc 100644
> --- a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> @@ -812,7 +812,7 @@ usb2_phy1: usb-phy@11c70200 {
>  
>  		hsusb: usb@11c60000 {
>  			compatible = "renesas,usbhs-r9a07g043",
> -				     "renesas,rza2-usbhs";
> +				     "renesas,rzg2l-usbhs";

This looks like ABI break and commit msg is quite vague about it.

Best regards,
Krzysztof
Biju Das March 9, 2024, 12:14 p.m. UTC | #2
Hi Krzysztof Kozlowski,

Thanks for the feedback.

> -----Original Message-----
> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> Sent: Saturday, March 9, 2024 12:08 PM
> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}: Update usbhs family compatible
> 
> On 08/03/2024 19:09, Biju Das wrote:
> > Replace 'renesas,rza2m-usbhs->renesas,rzg2l-usbhs' as family
> > compatible for RZ/G2L family SOCs as there is a difference in number
> > of pipe buffers compared to RZ/A2M.
> >
> > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> > ---
> >  arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 2 +-
> > arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 2 +-
> > arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 2 +-
> >  3 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> > b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> > index 8721f4c9fa0f..766c54b91acc 100644
> > --- a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> > @@ -812,7 +812,7 @@ usb2_phy1: usb-phy@11c70200 {
> >
> >  		hsusb: usb@11c60000 {
> >  			compatible = "renesas,usbhs-r9a07g043",
> > -				     "renesas,rza2-usbhs";
> > +				     "renesas,rzg2l-usbhs";
> 
> This looks like ABI break and commit msg is quite vague about it.

OK, Will update the commit message as driver is taking care of the backward
compatibility.

Cheers,
Biju
Krzysztof Kozlowski March 9, 2024, 12:25 p.m. UTC | #3
On 09/03/2024 13:14, Biju Das wrote:
> Hi Krzysztof Kozlowski,
> 
> Thanks for the feedback.
> 
>> -----Original Message-----
>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>> Sent: Saturday, March 9, 2024 12:08 PM
>> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}: Update usbhs family compatible
>>
>> On 08/03/2024 19:09, Biju Das wrote:
>>> Replace 'renesas,rza2m-usbhs->renesas,rzg2l-usbhs' as family
>>> compatible for RZ/G2L family SOCs as there is a difference in number
>>> of pipe buffers compared to RZ/A2M.
>>>
>>> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
>>> ---
>>>  arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 2 +-
>>> arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 2 +-
>>> arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 2 +-
>>>  3 files changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
>>> b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
>>> index 8721f4c9fa0f..766c54b91acc 100644
>>> --- a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
>>> +++ b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
>>> @@ -812,7 +812,7 @@ usb2_phy1: usb-phy@11c70200 {
>>>
>>>  		hsusb: usb@11c60000 {
>>>  			compatible = "renesas,usbhs-r9a07g043",
>>> -				     "renesas,rza2-usbhs";
>>> +				     "renesas,rzg2l-usbhs";
>>
>> This looks like ABI break and commit msg is quite vague about it.
> 
> OK, Will update the commit message as driver is taking care of the backward
> compatibility.

Ah, I was not precise here, you should consider the impact this is on
DTB used on other kernels. You guys should really stop using
imprecise/incorrect generic fallbacks and, since it is usually tricky to
know which fallback is correct or not, you should stop using them at all.

Such change of replacing fallback is really odd.

Best regards,
Krzysztof
Biju Das March 9, 2024, 12:32 p.m. UTC | #4
Hi Krzysztof Kozlowski,

> -----Original Message-----
> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> Sent: Saturday, March 9, 2024 12:26 PM
> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}: Update usbhs family compatible
> 
> On 09/03/2024 13:14, Biju Das wrote:
> > Hi Krzysztof Kozlowski,
> >
> > Thanks for the feedback.
> >
> >> -----Original Message-----
> >> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> >> Sent: Saturday, March 9, 2024 12:08 PM
> >> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}:
> >> Update usbhs family compatible
> >>
> >> On 08/03/2024 19:09, Biju Das wrote:
> >>> Replace 'renesas,rza2m-usbhs->renesas,rzg2l-usbhs' as family
> >>> compatible for RZ/G2L family SOCs as there is a difference in number
> >>> of pipe buffers compared to RZ/A2M.
> >>>
> >>> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> >>> ---
> >>>  arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 2 +-
> >>> arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 2 +-
> >>> arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 2 +-
> >>>  3 files changed, 3 insertions(+), 3 deletions(-)
> >>>
> >>> diff --git a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> >>> b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> >>> index 8721f4c9fa0f..766c54b91acc 100644
> >>> --- a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> >>> +++ b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> >>> @@ -812,7 +812,7 @@ usb2_phy1: usb-phy@11c70200 {
> >>>
> >>>  		hsusb: usb@11c60000 {
> >>>  			compatible = "renesas,usbhs-r9a07g043",
> >>> -				     "renesas,rza2-usbhs";
> >>> +				     "renesas,rzg2l-usbhs";
> >>
> >> This looks like ABI break and commit msg is quite vague about it.
> >
> > OK, Will update the commit message as driver is taking care of the
> > backward compatibility.
> 
> Ah, I was not precise here, you should consider the impact this is on DTB used on other kernels. You
> guys should really stop using imprecise/incorrect generic fallbacks and, since it is usually tricky to
> know which fallback is correct or not, you should stop using them at all.

There will be driver change to handle SoC specific compatible.

So ,

old DTB + old kernel will have 16 pipe buffers
old DTB + newer kernel will have 9 pipe buffers.
New DTB + new kernel will have 9 pipe buffer.

Cheer,
Biju
Krzysztof Kozlowski March 9, 2024, 1:30 p.m. UTC | #5
On 09/03/2024 13:32, Biju Das wrote:
> Hi Krzysztof Kozlowski,
> 
>> -----Original Message-----
>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>> Sent: Saturday, March 9, 2024 12:26 PM
>> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}: Update usbhs family compatible
>>
>> On 09/03/2024 13:14, Biju Das wrote:
>>> Hi Krzysztof Kozlowski,
>>>
>>> Thanks for the feedback.
>>>
>>>> -----Original Message-----
>>>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>>>> Sent: Saturday, March 9, 2024 12:08 PM
>>>> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}:
>>>> Update usbhs family compatible
>>>>
>>>> On 08/03/2024 19:09, Biju Das wrote:
>>>>> Replace 'renesas,rza2m-usbhs->renesas,rzg2l-usbhs' as family
>>>>> compatible for RZ/G2L family SOCs as there is a difference in number
>>>>> of pipe buffers compared to RZ/A2M.
>>>>>
>>>>> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
>>>>> ---
>>>>>  arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 2 +-
>>>>> arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 2 +-
>>>>> arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 2 +-
>>>>>  3 files changed, 3 insertions(+), 3 deletions(-)
>>>>>
>>>>> diff --git a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
>>>>> b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
>>>>> index 8721f4c9fa0f..766c54b91acc 100644
>>>>> --- a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
>>>>> +++ b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
>>>>> @@ -812,7 +812,7 @@ usb2_phy1: usb-phy@11c70200 {
>>>>>
>>>>>  		hsusb: usb@11c60000 {
>>>>>  			compatible = "renesas,usbhs-r9a07g043",
>>>>> -				     "renesas,rza2-usbhs";
>>>>> +				     "renesas,rzg2l-usbhs";
>>>>
>>>> This looks like ABI break and commit msg is quite vague about it.
>>>
>>> OK, Will update the commit message as driver is taking care of the
>>> backward compatibility.
>>
>> Ah, I was not precise here, you should consider the impact this is on DTB used on other kernels. You
>> guys should really stop using imprecise/incorrect generic fallbacks and, since it is usually tricky to
>> know which fallback is correct or not, you should stop using them at all.
> 
> There will be driver change to handle SoC specific compatible.
> 
> So ,
> 
> old DTB + old kernel will have 16 pipe buffers
> old DTB + newer kernel will have 9 pipe buffers.
> New DTB + new kernel will have 9 pipe buffer.

You missed new DTB and old kernel. This breaks all users of DTS. That's
the entire point of your broken generic compatibles which you did not
address.

Best regards,
Krzysztof
Biju Das March 9, 2024, 3:43 p.m. UTC | #6
Hi Krzysztof Kozlowski,

> -----Original Message-----
> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> Sent: Saturday, March 9, 2024 1:30 PM
> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}: Update usbhs family compatible
> 
> On 09/03/2024 13:32, Biju Das wrote:
> > Hi Krzysztof Kozlowski,
> >
> >> -----Original Message-----
> >> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> >> Sent: Saturday, March 9, 2024 12:26 PM
> >> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}:
> >> Update usbhs family compatible
> >>
> >> On 09/03/2024 13:14, Biju Das wrote:
> >>> Hi Krzysztof Kozlowski,
> >>>
> >>> Thanks for the feedback.
> >>>
> >>>> -----Original Message-----
> >>>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> >>>> Sent: Saturday, March 9, 2024 12:08 PM
> >>>> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}:
> >>>> Update usbhs family compatible
> >>>>
> >>>> On 08/03/2024 19:09, Biju Das wrote:
> >>>>> Replace 'renesas,rza2m-usbhs->renesas,rzg2l-usbhs' as family
> >>>>> compatible for RZ/G2L family SOCs as there is a difference in
> >>>>> number of pipe buffers compared to RZ/A2M.
> >>>>>
> >>>>> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> >>>>> ---
> >>>>>  arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 2 +-
> >>>>> arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 2 +-
> >>>>> arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 2 +-
> >>>>>  3 files changed, 3 insertions(+), 3 deletions(-)
> >>>>>
> >>>>> diff --git a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> >>>>> b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> >>>>> index 8721f4c9fa0f..766c54b91acc 100644
> >>>>> --- a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> >>>>> +++ b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> >>>>> @@ -812,7 +812,7 @@ usb2_phy1: usb-phy@11c70200 {
> >>>>>
> >>>>>  		hsusb: usb@11c60000 {
> >>>>>  			compatible = "renesas,usbhs-r9a07g043",
> >>>>> -				     "renesas,rza2-usbhs";
> >>>>> +				     "renesas,rzg2l-usbhs";
> >>>>
> >>>> This looks like ABI break and commit msg is quite vague about it.
> >>>
> >>> OK, Will update the commit message as driver is taking care of the
> >>> backward compatibility.
> >>
> >> Ah, I was not precise here, you should consider the impact this is on
> >> DTB used on other kernels. You guys should really stop using
> >> imprecise/incorrect generic fallbacks and, since it is usually tricky to know which fallback is
> correct or not, you should stop using them at all.
> >
> > There will be driver change to handle SoC specific compatible.
> >
> > So ,
> >
> > old DTB + old kernel will have 16 pipe buffers old DTB + newer kernel
> > will have 9 pipe buffers.
> > New DTB + new kernel will have 9 pipe buffer.
> 
> You missed new DTB and old kernel. This breaks all users of DTS. That's the entire point of your broken
> generic compatibles which you did not address.

As per my knowledge, there is no user in RZ/G2L is using new DTB and old kernel.
So, it is safe.

Cheers,
Biju
Biju Das March 9, 2024, 3:53 p.m. UTC | #7
Hi Krzysztof Kozlowski,

> -----Original Message-----
> From: Biju Das <biju.das.jz@bp.renesas.com>
> Sent: Saturday, March 9, 2024 3:43 PM
> Subject: RE: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}: Update usbhs family compatible
> 
> Hi Krzysztof Kozlowski,
> 
> > -----Original Message-----
> > From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> > Sent: Saturday, March 9, 2024 1:30 PM
> > Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}:
> > Update usbhs family compatible
> >
> > On 09/03/2024 13:32, Biju Das wrote:
> > > Hi Krzysztof Kozlowski,
> > >
> > >> -----Original Message-----
> > >> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> > >> Sent: Saturday, March 9, 2024 12:26 PM
> > >> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}:
> > >> Update usbhs family compatible
> > >>
> > >> On 09/03/2024 13:14, Biju Das wrote:
> > >>> Hi Krzysztof Kozlowski,
> > >>>
> > >>> Thanks for the feedback.
> > >>>
> > >>>> -----Original Message-----
> > >>>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> > >>>> Sent: Saturday, March 9, 2024 12:08 PM
> > >>>> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}:
> > >>>> Update usbhs family compatible
> > >>>>
> > >>>> On 08/03/2024 19:09, Biju Das wrote:
> > >>>>> Replace 'renesas,rza2m-usbhs->renesas,rzg2l-usbhs' as family
> > >>>>> compatible for RZ/G2L family SOCs as there is a difference in
> > >>>>> number of pipe buffers compared to RZ/A2M.
> > >>>>>
> > >>>>> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> > >>>>> ---
> > >>>>>  arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 2 +-
> > >>>>> arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 2 +-
> > >>>>> arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 2 +-
> > >>>>>  3 files changed, 3 insertions(+), 3 deletions(-)
> > >>>>>
> > >>>>> diff --git a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> > >>>>> b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> > >>>>> index 8721f4c9fa0f..766c54b91acc 100644
> > >>>>> --- a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> > >>>>> +++ b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> > >>>>> @@ -812,7 +812,7 @@ usb2_phy1: usb-phy@11c70200 {
> > >>>>>
> > >>>>>  		hsusb: usb@11c60000 {
> > >>>>>  			compatible = "renesas,usbhs-r9a07g043",
> > >>>>> -				     "renesas,rza2-usbhs";
> > >>>>> +				     "renesas,rzg2l-usbhs";
> > >>>>
> > >>>> This looks like ABI break and commit msg is quite vague about it.
> > >>>
> > >>> OK, Will update the commit message as driver is taking care of the
> > >>> backward compatibility.
> > >>
> > >> Ah, I was not precise here, you should consider the impact this is
> > >> on DTB used on other kernels. You guys should really stop using
> > >> imprecise/incorrect generic fallbacks and, since it is usually
> > >> tricky to know which fallback is
> > correct or not, you should stop using them at all.
> > >
> > > There will be driver change to handle SoC specific compatible.
> > >
> > > So ,
> > >
> > > old DTB + old kernel will have 16 pipe buffers old DTB + newer
> > > kernel will have 9 pipe buffers.
> > > New DTB + new kernel will have 9 pipe buffer.
> >
> > You missed new DTB and old kernel. This breaks all users of DTS.
> > That's the entire point of your broken generic compatibles which you did not address.
> 
> As per my knowledge, there is no user in RZ/G2L is using new DTB and old kernel.
> So, it is safe.

If there is a user for such change, we could use

	compatible = "renesas,usbhs-r9a07g043",
	             "renesas,rzg2l-usbhs",
			 "renesas,rza2-usbhs";

Or

	compatible = "renesas,usbhs-r9a07g043",
			 "renesas,rza2-usbhs";


The former consumes less memory compared to the later.

As later requires, 3 platform structures for rz/g2l, rz/v2l and rz/gul
whereas the former requires just 1.


Cheers,
Biju
Biju Das March 10, 2024, 7:57 a.m. UTC | #8
Hi Krzysztof Kozlowski,

> >
> > > -----Original Message-----
> > > From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> > > Sent: Saturday, March 9, 2024 1:30 PM
> > > Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}:
> > > Update usbhs family compatible
> > >
> > > On 09/03/2024 13:32, Biju Das wrote:
> > > > Hi Krzysztof Kozlowski,
> > > >
> > > >> -----Original Message-----
> > > >> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> > > >> Sent: Saturday, March 9, 2024 12:26 PM
> > > >> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}:
> > > >> Update usbhs family compatible
> > > >>
> > > >> On 09/03/2024 13:14, Biju Das wrote:
> > > >>> Hi Krzysztof Kozlowski,
> > > >>>
> > > >>> Thanks for the feedback.
> > > >>>
> > > >>>> -----Original Message-----
> > > >>>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> > > >>>> Sent: Saturday, March 9, 2024 12:08 PM
> > > >>>> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}:
> > > >>>> Update usbhs family compatible
> > > >>>>
> > > >>>> On 08/03/2024 19:09, Biju Das wrote:
> > > >>>>> Replace 'renesas,rza2m-usbhs->renesas,rzg2l-usbhs' as family
> > > >>>>> compatible for RZ/G2L family SOCs as there is a difference in
> > > >>>>> number of pipe buffers compared to RZ/A2M.
> > > >>>>>
> > > >>>>> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> > > >>>>> ---
> > > >>>>>  arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 2 +-
> > > >>>>> arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 2 +-
> > > >>>>> arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 2 +-
> > > >>>>>  3 files changed, 3 insertions(+), 3 deletions(-)
> > > >>>>>
> > > >>>>> diff --git a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> > > >>>>> b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> > > >>>>> index 8721f4c9fa0f..766c54b91acc 100644
> > > >>>>> --- a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> > > >>>>> +++ b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
> > > >>>>> @@ -812,7 +812,7 @@ usb2_phy1: usb-phy@11c70200 {
> > > >>>>>
> > > >>>>>  		hsusb: usb@11c60000 {
> > > >>>>>  			compatible = "renesas,usbhs-r9a07g043",
> > > >>>>> -				     "renesas,rza2-usbhs";
> > > >>>>> +				     "renesas,rzg2l-usbhs";
> > > >>>>
> > > >>>> This looks like ABI break and commit msg is quite vague about it.
> > > >>>
> > > >>> OK, Will update the commit message as driver is taking care of
> > > >>> the backward compatibility.
> > > >>
> > > >> Ah, I was not precise here, you should consider the impact this
> > > >> is on DTB used on other kernels. You guys should really stop
> > > >> using imprecise/incorrect generic fallbacks and, since it is
> > > >> usually tricky to know which fallback is
> > > correct or not, you should stop using them at all.
> > > >
> > > > There will be driver change to handle SoC specific compatible.
> > > >
> > > > So ,
> > > >
> > > > old DTB + old kernel will have 16 pipe buffers old DTB + newer
> > > > kernel will have 9 pipe buffers.
> > > > New DTB + new kernel will have 9 pipe buffer.
> > >
> > > You missed new DTB and old kernel. This breaks all users of DTS.
> > > That's the entire point of your broken generic compatibles which you did not address.
> >
> > As per my knowledge, there is no user in RZ/G2L is using new DTB and old kernel.
> > So, it is safe.
> 
> If there is a user for such change, we could use
> 
> 	compatible = "renesas,usbhs-r9a07g043",
> 	             "renesas,rzg2l-usbhs",
> 			 "renesas,rza2-usbhs";
> 
> Or
> 
> 	compatible = "renesas,usbhs-r9a07g043",
> 			 "renesas,rza2-usbhs";
> 
> 
> The former consumes less memory compared to the later.
> 
> As later requires, 3 platform structures for rz/g2l, rz/v2l and rz/gul whereas the former requires just
> 1.

Another way is using RZ/G2L SoC fallback compatible for both RZ/V2L and RZ/Five varients

	compatible = "renesas,usbhs-r9a07g043",
	             "renesas, usbhs-r9a07g044",
			 "renesas,rza2-usbhs";

This will fit into all ABI combinations with optimized memory usage in driver related to platform structure.

old DTB + old kernel will have 16 pipe buffers
old DTB + new kernel will have 9 pipe buffers
New DTB + old kernel will have 16 pipe buffers
New DTB + new kernel will have 9 pipe buffers

Cheers,
Biju
Krzysztof Kozlowski March 10, 2024, 8:03 a.m. UTC | #9
On 09/03/2024 16:43, Biju Das wrote:
> Hi Krzysztof Kozlowski,
> 
>> -----Original Message-----
>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>> Sent: Saturday, March 9, 2024 1:30 PM
>> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}: Update usbhs family compatible
>>
>> On 09/03/2024 13:32, Biju Das wrote:
>>> Hi Krzysztof Kozlowski,
>>>
>>>> -----Original Message-----
>>>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>>>> Sent: Saturday, March 9, 2024 12:26 PM
>>>> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}:
>>>> Update usbhs family compatible
>>>>
>>>> On 09/03/2024 13:14, Biju Das wrote:
>>>>> Hi Krzysztof Kozlowski,
>>>>>
>>>>> Thanks for the feedback.
>>>>>
>>>>>> -----Original Message-----
>>>>>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>>>>>> Sent: Saturday, March 9, 2024 12:08 PM
>>>>>> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}:
>>>>>> Update usbhs family compatible
>>>>>>
>>>>>> On 08/03/2024 19:09, Biju Das wrote:
>>>>>>> Replace 'renesas,rza2m-usbhs->renesas,rzg2l-usbhs' as family
>>>>>>> compatible for RZ/G2L family SOCs as there is a difference in
>>>>>>> number of pipe buffers compared to RZ/A2M.
>>>>>>>
>>>>>>> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
>>>>>>> ---
>>>>>>>  arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 2 +-
>>>>>>> arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 2 +-
>>>>>>> arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 2 +-
>>>>>>>  3 files changed, 3 insertions(+), 3 deletions(-)
>>>>>>>
>>>>>>> diff --git a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
>>>>>>> b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
>>>>>>> index 8721f4c9fa0f..766c54b91acc 100644
>>>>>>> --- a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
>>>>>>> +++ b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
>>>>>>> @@ -812,7 +812,7 @@ usb2_phy1: usb-phy@11c70200 {
>>>>>>>
>>>>>>>  		hsusb: usb@11c60000 {
>>>>>>>  			compatible = "renesas,usbhs-r9a07g043",
>>>>>>> -				     "renesas,rza2-usbhs";
>>>>>>> +				     "renesas,rzg2l-usbhs";
>>>>>>
>>>>>> This looks like ABI break and commit msg is quite vague about it.
>>>>>
>>>>> OK, Will update the commit message as driver is taking care of the
>>>>> backward compatibility.
>>>>
>>>> Ah, I was not precise here, you should consider the impact this is on
>>>> DTB used on other kernels. You guys should really stop using
>>>> imprecise/incorrect generic fallbacks and, since it is usually tricky to know which fallback is
>> correct or not, you should stop using them at all.
>>>
>>> There will be driver change to handle SoC specific compatible.
>>>
>>> So ,
>>>
>>> old DTB + old kernel will have 16 pipe buffers old DTB + newer kernel
>>> will have 9 pipe buffers.
>>> New DTB + new kernel will have 9 pipe buffer.
>>
>> You missed new DTB and old kernel. This breaks all users of DTS. That's the entire point of your broken
>> generic compatibles which you did not address.
> 
> As per my knowledge, there is no user in RZ/G2L is using new DTB and old kernel.
> So, it is safe.

What do you mean? There can be hundreds of users like this, every
company could fork the kernel but use exported DTS. Or every other
open-source project using exported/packaged DTS repo.

Best regards,
Krzysztof
Krzysztof Kozlowski March 10, 2024, 8:06 a.m. UTC | #10
On 10/03/2024 08:57, Biju Das wrote:
>>>>> old DTB + old kernel will have 16 pipe buffers old DTB + newer
>>>>> kernel will have 9 pipe buffers.
>>>>> New DTB + new kernel will have 9 pipe buffer.
>>>>
>>>> You missed new DTB and old kernel. This breaks all users of DTS.
>>>> That's the entire point of your broken generic compatibles which you did not address.
>>>
>>> As per my knowledge, there is no user in RZ/G2L is using new DTB and old kernel.
>>> So, it is safe.
>>
>> If there is a user for such change, we could use
>>
>> 	compatible = "renesas,usbhs-r9a07g043",
>> 	             "renesas,rzg2l-usbhs",
>> 			 "renesas,rza2-usbhs";
>>
>> Or
>>
>> 	compatible = "renesas,usbhs-r9a07g043",
>> 			 "renesas,rza2-usbhs";
>>
>>
>> The former consumes less memory compared to the later.
>>
>> As later requires, 3 platform structures for rz/g2l, rz/v2l and rz/gul whereas the former requires just
>> 1.
> 
> Another way is using RZ/G2L SoC fallback compatible for both RZ/V2L and RZ/Five varients
> 
> 	compatible = "renesas,usbhs-r9a07g043",
> 	             "renesas, usbhs-r9a07g044",

How does it solve anything? Nothing binds to this.

> 			 "renesas,rza2-usbhs";
> 
> This will fit into all ABI combinations with optimized memory usage in driver related to platform structure.
> 
> old DTB + old kernel will have 16 pipe buffers
> old DTB + new kernel will have 9 pipe buffers
> New DTB + old kernel will have 16 pipe buffers
> New DTB + new kernel will have 9 pipe buffers

Maybe just drop incorrect generic compatibles since you are breaking
users? You did not provide any rationale against my arguments.

Best regards,
Krzysztof
Biju Das March 10, 2024, 8:16 a.m. UTC | #11
Hi Krzysztof Kozlowski,

> -----Original Message-----
> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> Sent: Sunday, March 10, 2024 8:06 AM
> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}: Update usbhs family compatible
> 
> On 10/03/2024 08:57, Biju Das wrote:
> >>>>> old DTB + old kernel will have 16 pipe buffers old DTB + newer
> >>>>> kernel will have 9 pipe buffers.
> >>>>> New DTB + new kernel will have 9 pipe buffer.
> >>>>
> >>>> You missed new DTB and old kernel. This breaks all users of DTS.
> >>>> That's the entire point of your broken generic compatibles which you did not address.
> >>>
> >>> As per my knowledge, there is no user in RZ/G2L is using new DTB and old kernel.
> >>> So, it is safe.
> >>
> >> If there is a user for such change, we could use
> >>
> >> 	compatible = "renesas,usbhs-r9a07g043",
> >> 	             "renesas,rzg2l-usbhs",
> >> 			 "renesas,rza2-usbhs";
> >>
> >> Or
> >>
> >> 	compatible = "renesas,usbhs-r9a07g043",
> >> 			 "renesas,rza2-usbhs";
> >>
> >>
> >> The former consumes less memory compared to the later.
> >>
> >> As later requires, 3 platform structures for rz/g2l, rz/v2l and
> >> rz/gul whereas the former requires just 1.
> >
> > Another way is using RZ/G2L SoC fallback compatible for both RZ/V2L
> > and RZ/Five varients
> >
> > 	compatible = "renesas,usbhs-r9a07g043",
> > 	             "renesas, usbhs-r9a07g044",
> 
> How does it solve anything? Nothing binds to this.

This will solve all the issues.

The usbhs-r9a07g043 IP is derived from usbhs-r9a07g044 that is derived from rza2-usbhs.

> 
> > 			 "renesas,rza2-usbhs";
> >
> > This will fit into all ABI combinations with optimized memory usage in driver related to platform
> structure.
> >
> > old DTB + old kernel will have 16 pipe buffers old DTB + new kernel
> > will have 9 pipe buffers New DTB + old kernel will have 16 pipe
> > buffers New DTB + new kernel will have 9 pipe buffers
> 
> Maybe just drop incorrect generic compatibles since you are breaking users? You did not provide any
> rationale against my arguments.

The above model does not break any users. Can you please give an example which breaks the users?


Cheers,
Biju
Krzysztof Kozlowski March 10, 2024, 8:39 a.m. UTC | #12
On 10/03/2024 09:16, Biju Das wrote:
> Hi Krzysztof Kozlowski,
> 
>> -----Original Message-----
>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>> Sent: Sunday, March 10, 2024 8:06 AM
>> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}: Update usbhs family compatible
>>
>> On 10/03/2024 08:57, Biju Das wrote:
>>>>>>> old DTB + old kernel will have 16 pipe buffers old DTB + newer
>>>>>>> kernel will have 9 pipe buffers.
>>>>>>> New DTB + new kernel will have 9 pipe buffer.
>>>>>>
>>>>>> You missed new DTB and old kernel. This breaks all users of DTS.
>>>>>> That's the entire point of your broken generic compatibles which you did not address.
>>>>>
>>>>> As per my knowledge, there is no user in RZ/G2L is using new DTB and old kernel.
>>>>> So, it is safe.
>>>>
>>>> If there is a user for such change, we could use
>>>>
>>>> 	compatible = "renesas,usbhs-r9a07g043",
>>>> 	             "renesas,rzg2l-usbhs",
>>>> 			 "renesas,rza2-usbhs";
>>>>
>>>> Or
>>>>
>>>> 	compatible = "renesas,usbhs-r9a07g043",
>>>> 			 "renesas,rza2-usbhs";
>>>>
>>>>
>>>> The former consumes less memory compared to the later.
>>>>
>>>> As later requires, 3 platform structures for rz/g2l, rz/v2l and
>>>> rz/gul whereas the former requires just 1.
>>>
>>> Another way is using RZ/G2L SoC fallback compatible for both RZ/V2L
>>> and RZ/Five varients
>>>
>>> 	compatible = "renesas,usbhs-r9a07g043",
>>> 	             "renesas, usbhs-r9a07g044",
>>
>> How does it solve anything? Nothing binds to this.
> 
> This will solve all the issues.

That's not really the answer, but I see you plan to keep old fallback.
So this means old fallback is correct and entire patchset does not make
sense.

This is confusing.

Best regards,
Krzysztof
Biju Das March 10, 2024, 9:59 a.m. UTC | #13
Hi Krzysztof Kozlowski,

> -----Original Message-----
> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> Sent: Sunday, March 10, 2024 8:40 AM
> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}: Update usbhs family compatible
> 
> On 10/03/2024 09:16, Biju Das wrote:
> > Hi Krzysztof Kozlowski,
> >
> >> -----Original Message-----
> >> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> >> Sent: Sunday, March 10, 2024 8:06 AM
> >> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}:
> >> Update usbhs family compatible
> >>
> >> On 10/03/2024 08:57, Biju Das wrote:
> >>>>>>> old DTB + old kernel will have 16 pipe buffers old DTB + newer
> >>>>>>> kernel will have 9 pipe buffers.
> >>>>>>> New DTB + new kernel will have 9 pipe buffer.
> >>>>>>
> >>>>>> You missed new DTB and old kernel. This breaks all users of DTS.
> >>>>>> That's the entire point of your broken generic compatibles which you did not address.
> >>>>>
> >>>>> As per my knowledge, there is no user in RZ/G2L is using new DTB and old kernel.
> >>>>> So, it is safe.
> >>>>
> >>>> If there is a user for such change, we could use
> >>>>
> >>>> 	compatible = "renesas,usbhs-r9a07g043",
> >>>> 	             "renesas,rzg2l-usbhs",
> >>>> 			 "renesas,rza2-usbhs";
> >>>>
> >>>> Or
> >>>>
> >>>> 	compatible = "renesas,usbhs-r9a07g043",
> >>>> 			 "renesas,rza2-usbhs";
> >>>>
> >>>>
> >>>> The former consumes less memory compared to the later.
> >>>>
> >>>> As later requires, 3 platform structures for rz/g2l, rz/v2l and
> >>>> rz/gul whereas the former requires just 1.
> >>>
> >>> Another way is using RZ/G2L SoC fallback compatible for both RZ/V2L
> >>> and RZ/Five varients
> >>>
> >>> 	compatible = "renesas,usbhs-r9a07g043",
> >>> 	             "renesas, usbhs-r9a07g044",
> >>
> >> How does it solve anything? Nothing binds to this.
> >
> > This will solve all the issues.
> 
> That's not really the answer, but I see you plan to keep old fallback.

Yes, To avoid the ABI breakage as per the use case you mentioned for new dtb + old kernel

> So this means old fallback is correct and entire patchset does not make sense.
> 
> This is confusing.

I need to correct the binding/driver code as per the below for avoiding all possible ABI breakage
and at the same time optimize the memory usage in driver as all(r9a07g0{43,44,54} belong
to the same RZ/G2L family SoCs.


	compatible = "renesas,usbhs-r9a07g043",
	             "renesas,usbhs-r9a07g044",
			 "renesas,rza2-usbhs";

Or

	compatible = "renesas,usbhs-r9a07g043",
	             "renesas,rzg2l-usbhs",
			 "renesas,rza2-usbhs";


Cheers,
Biju
Geert Uytterhoeven March 11, 2024, 9:03 a.m. UTC | #14
Hi Krzysztof,

On Sat, Mar 9, 2024 at 2:30 PM Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
> On 09/03/2024 13:32, Biju Das wrote:
> >> -----Original Message-----
> >> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> >>>> This looks like ABI break and commit msg is quite vague about it.
> >>>
> >>> OK, Will update the commit message as driver is taking care of the
> >>> backward compatibility.
> >>
> >> Ah, I was not precise here, you should consider the impact this is on DTB used on other kernels. You
> >> guys should really stop using imprecise/incorrect generic fallbacks and, since it is usually tricky to
> >> know which fallback is correct or not, you should stop using them at all.
> >
> > There will be driver change to handle SoC specific compatible.
> >
> > So ,
> >
> > old DTB + old kernel will have 16 pipe buffers
> > old DTB + newer kernel will have 9 pipe buffers.
> > New DTB + new kernel will have 9 pipe buffer.
>
> You missed new DTB and old kernel. This breaks all users of DTS. That's
> the entire point of your broken generic compatibles which you did not
> address.

Doesn't DT guarantee only forward compatibility?

Gr{oetje,eeting}s,

                        Geert
Krzysztof Kozlowski March 12, 2024, 10:58 a.m. UTC | #15
On 11/03/2024 10:03, Geert Uytterhoeven wrote:
> Hi Krzysztof,
> 
> On Sat, Mar 9, 2024 at 2:30 PM Krzysztof Kozlowski
> <krzysztof.kozlowski@linaro.org> wrote:
>> On 09/03/2024 13:32, Biju Das wrote:
>>>> -----Original Message-----
>>>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>>>>>> This looks like ABI break and commit msg is quite vague about it.
>>>>>
>>>>> OK, Will update the commit message as driver is taking care of the
>>>>> backward compatibility.
>>>>
>>>> Ah, I was not precise here, you should consider the impact this is on DTB used on other kernels. You
>>>> guys should really stop using imprecise/incorrect generic fallbacks and, since it is usually tricky to
>>>> know which fallback is correct or not, you should stop using them at all.
>>>
>>> There will be driver change to handle SoC specific compatible.
>>>
>>> So ,
>>>
>>> old DTB + old kernel will have 16 pipe buffers
>>> old DTB + newer kernel will have 9 pipe buffers.
>>> New DTB + new kernel will have 9 pipe buffer.
>>
>> You missed new DTB and old kernel. This breaks all users of DTS. That's
>> the entire point of your broken generic compatibles which you did not
>> address.
> 
> Doesn't DT guarantee only forward compatibility?

If by DT you mean DTS, then:
The DTS is exported from kernel since long time and (might be|is used)
in other projects, like recently in U-Boot. Therefore dropping
compatible from DTS, which is used for binding, might affect these 3rd
party projects.

While you are right that we do not guarantee such compatibility, we also
might want to have it.

Best regards,
Krzysztof
Biju Das March 12, 2024, 6:13 p.m. UTC | #16
Hi Krzysztof Kozlowski,

> -----Original Message-----
> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> Sent: Tuesday, March 12, 2024 10:58 AM
> Subject: Re: [PATCH 4/4] arm64: dts: renesas: r9a07g0{43,44,54}: Update usbhs family compatible
> 
> On 11/03/2024 10:03, Geert Uytterhoeven wrote:
> > Hi Krzysztof,
> >
> > On Sat, Mar 9, 2024 at 2:30 PM Krzysztof Kozlowski
> > <krzysztof.kozlowski@linaro.org> wrote:
> >> On 09/03/2024 13:32, Biju Das wrote:
> >>>> -----Original Message-----
> >>>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> >>>>>> This looks like ABI break and commit msg is quite vague about it.
> >>>>>
> >>>>> OK, Will update the commit message as driver is taking care of the
> >>>>> backward compatibility.
> >>>>
> >>>> Ah, I was not precise here, you should consider the impact this is
> >>>> on DTB used on other kernels. You guys should really stop using
> >>>> imprecise/incorrect generic fallbacks and, since it is usually tricky to know which fallback is
> correct or not, you should stop using them at all.
> >>>
> >>> There will be driver change to handle SoC specific compatible.
> >>>
> >>> So ,
> >>>
> >>> old DTB + old kernel will have 16 pipe buffers old DTB + newer
> >>> kernel will have 9 pipe buffers.
> >>> New DTB + new kernel will have 9 pipe buffer.
> >>
> >> You missed new DTB and old kernel. This breaks all users of DTS.
> >> That's the entire point of your broken generic compatibles which you
> >> did not address.
> >
> > Doesn't DT guarantee only forward compatibility?
> 
> If by DT you mean DTS, then:
> The DTS is exported from kernel since long time and (might be|is used) in other projects, like recently
> in U-Boot. Therefore dropping compatible from DTS, which is used for binding, might affect these 3rd
> party projects.
> 
> While you are right that we do not guarantee such compatibility, we also might want to have it.

If that is the case, the I would like to retain renesas,rzg2l-usbhs for grouping similar RZ/G2L
alike SoCs as in [1]. In the driver, I will use SoC specific compatible to avoid ABI breakage
related to old DTB  + new kernel.

[1] https://patchwork.kernel.org/project/linux-renesas-soc/patch/20240308180919.6603-5-biju.das.jz@bp.renesas.com/

Cheers,
Biju
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
index 8721f4c9fa0f..766c54b91acc 100644
--- a/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
+++ b/arch/arm64/boot/dts/renesas/r9a07g043.dtsi
@@ -812,7 +812,7 @@  usb2_phy1: usb-phy@11c70200 {
 
 		hsusb: usb@11c60000 {
 			compatible = "renesas,usbhs-r9a07g043",
-				     "renesas,rza2-usbhs";
+				     "renesas,rzg2l-usbhs";
 			reg = <0 0x11c60000 0 0x10000>;
 			interrupts = <SOC_PERIPHERAL_IRQ(100) IRQ_TYPE_EDGE_RISING>,
 				     <SOC_PERIPHERAL_IRQ(101) IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm64/boot/dts/renesas/r9a07g044.dtsi b/arch/arm64/boot/dts/renesas/r9a07g044.dtsi
index 9f00b75d2bd0..88634ae43287 100644
--- a/arch/arm64/boot/dts/renesas/r9a07g044.dtsi
+++ b/arch/arm64/boot/dts/renesas/r9a07g044.dtsi
@@ -1217,7 +1217,7 @@  usb2_phy1: usb-phy@11c70200 {
 
 		hsusb: usb@11c60000 {
 			compatible = "renesas,usbhs-r9a07g044",
-				     "renesas,rza2-usbhs";
+				     "renesas,rzg2l-usbhs";
 			reg = <0 0x11c60000 0 0x10000>;
 			interrupts = <GIC_SPI 100 IRQ_TYPE_EDGE_RISING>,
 				     <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm64/boot/dts/renesas/r9a07g054.dtsi b/arch/arm64/boot/dts/renesas/r9a07g054.dtsi
index 53d8905f367a..e89bfe4085f5 100644
--- a/arch/arm64/boot/dts/renesas/r9a07g054.dtsi
+++ b/arch/arm64/boot/dts/renesas/r9a07g054.dtsi
@@ -1225,7 +1225,7 @@  usb2_phy1: usb-phy@11c70200 {
 
 		hsusb: usb@11c60000 {
 			compatible = "renesas,usbhs-r9a07g054",
-				     "renesas,rza2-usbhs";
+				     "renesas,rzg2l-usbhs";
 			reg = <0 0x11c60000 0 0x10000>;
 			interrupts = <GIC_SPI 100 IRQ_TYPE_EDGE_RISING>,
 				     <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,