diff mbox series

[v3,3/3] MIPS: Ingenic: Refresh USB nodes to match driver changes.

Message ID 1649964337-114337-4-git-send-email-zhouyanjie@wanyeetech.com
State Superseded
Headers show
Series Add OTG support for Ingenic SoCs. | expand

Commit Message

Zhou Yanjie April 14, 2022, 7:25 p.m. UTC 
Refresh USB nodes in the jz4780.dtsi, x1000.dtsi, and x1830.dtsi files.

Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
---

Notes:
    v3:
    New patch.

 arch/mips/boot/dts/ingenic/jz4780.dtsi | 2 +-
 arch/mips/boot/dts/ingenic/x1000.dtsi  | 2 +-
 arch/mips/boot/dts/ingenic/x1830.dtsi  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Paul Cercueil April 15, 2022, 3:07 p.m. UTC | #1 
Hi Zhou,


Le ven., avril 15 2022 at 03:25:37 +0800, 周琰杰 (Zhou Yanjie) 
<zhouyanjie@wanyeetech.com> a écrit :
> Refresh USB nodes in the jz4780.dtsi, x1000.dtsi, and x1830.dtsi 
> files.
> 
> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
> ---
> 
> Notes:
>     v3:
>     New patch.
> 
>  arch/mips/boot/dts/ingenic/jz4780.dtsi | 2 +-
>  arch/mips/boot/dts/ingenic/x1000.dtsi  | 2 +-
>  arch/mips/boot/dts/ingenic/x1830.dtsi  | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/mips/boot/dts/ingenic/jz4780.dtsi 
> b/arch/mips/boot/dts/ingenic/jz4780.dtsi
> index b998301..c182a65 100644
> --- a/arch/mips/boot/dts/ingenic/jz4780.dtsi
> +++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi
> @@ -577,7 +577,7 @@
>  	};
> 
>  	otg: usb@13500000 {
> -		compatible = "ingenic,jz4780-otg", "snps,dwc2";
> +		compatible = "ingenic,jz4780-otg";

Could you refresh my memory - why are the "snps,dwc2" fallback strings 
removed?

To me it seems like they should be here, since the OTG IP in Ingenic 
SoCs is derived from the DWC2 IP.

Cheers,
-Paul

>  		reg = <0x13500000 0x40000>;
> 
>  		interrupt-parent = <&intc>;
> diff --git a/arch/mips/boot/dts/ingenic/x1000.dtsi 
> b/arch/mips/boot/dts/ingenic/x1000.dtsi
> index 8bd27ede..343818a2 100644
> --- a/arch/mips/boot/dts/ingenic/x1000.dtsi
> +++ b/arch/mips/boot/dts/ingenic/x1000.dtsi
> @@ -366,7 +366,7 @@
>  	};
> 
>  	otg: usb@13500000 {
> -		compatible = "ingenic,x1000-otg", "snps,dwc2";
> +		compatible = "ingenic,x1000-otg";
>  		reg = <0x13500000 0x40000>;
> 
>  		interrupt-parent = <&intc>;
> diff --git a/arch/mips/boot/dts/ingenic/x1830.dtsi 
> b/arch/mips/boot/dts/ingenic/x1830.dtsi
> index 2595df8..6aff19f 100644
> --- a/arch/mips/boot/dts/ingenic/x1830.dtsi
> +++ b/arch/mips/boot/dts/ingenic/x1830.dtsi
> @@ -355,7 +355,7 @@
>  	};
> 
>  	otg: usb@13500000 {
> -		compatible = "ingenic,x1830-otg", "snps,dwc2";
> +		compatible = "ingenic,x1830-otg";
>  		reg = <0x13500000 0x40000>;
> 
>  		interrupt-parent = <&intc>;
> --
> 2.7.4
>
Zhou Yanjie April 16, 2022, 12:16 p.m. UTC | #2 
Hi Paul,

On 2022/4/15 下午11:07, Paul Cercueil wrote:
> Hi Zhou,
>
>
> Le ven., avril 15 2022 at 03:25:37 +0800, 周琰杰 (Zhou Yanjie) 
> <zhouyanjie@wanyeetech.com> a écrit :
>> Refresh USB nodes in the jz4780.dtsi, x1000.dtsi, and x1830.dtsi files.
>>
>> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
>> ---
>>
>> Notes:
>>     v3:
>>     New patch.
>>
>>  arch/mips/boot/dts/ingenic/jz4780.dtsi | 2 +-
>>  arch/mips/boot/dts/ingenic/x1000.dtsi  | 2 +-
>>  arch/mips/boot/dts/ingenic/x1830.dtsi  | 2 +-
>>  3 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/mips/boot/dts/ingenic/jz4780.dtsi 
>> b/arch/mips/boot/dts/ingenic/jz4780.dtsi
>> index b998301..c182a65 100644
>> --- a/arch/mips/boot/dts/ingenic/jz4780.dtsi
>> +++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi
>> @@ -577,7 +577,7 @@
>>      };
>>
>>      otg: usb@13500000 {
>> -        compatible = "ingenic,jz4780-otg", "snps,dwc2";
>> +        compatible = "ingenic,jz4780-otg";
>
> Could you refresh my memory - why are the "snps,dwc2" fallback strings 
> removed?
>
> To me it seems like they should be here, since the OTG IP in Ingenic 
> SoCs is derived from the DWC2 IP.


The reason is that Nikolaus found that the current jz4780.dtsi will cause
dtbscheck to complain. After discussion, Nikolaus concluded three feasible
solutions, see here:
https://lkml.org/lkml/2022/4/13/1097

And it seems that Krzysztof prefers the c) option.


Thanks and best regards!


>
> Cheers,
> -Paul
>
>>          reg = <0x13500000 0x40000>;
>>
>>          interrupt-parent = <&intc>;
>> diff --git a/arch/mips/boot/dts/ingenic/x1000.dtsi 
>> b/arch/mips/boot/dts/ingenic/x1000.dtsi
>> index 8bd27ede..343818a2 100644
>> --- a/arch/mips/boot/dts/ingenic/x1000.dtsi
>> +++ b/arch/mips/boot/dts/ingenic/x1000.dtsi
>> @@ -366,7 +366,7 @@
>>      };
>>
>>      otg: usb@13500000 {
>> -        compatible = "ingenic,x1000-otg", "snps,dwc2";
>> +        compatible = "ingenic,x1000-otg";
>>          reg = <0x13500000 0x40000>;
>>
>>          interrupt-parent = <&intc>;
>> diff --git a/arch/mips/boot/dts/ingenic/x1830.dtsi 
>> b/arch/mips/boot/dts/ingenic/x1830.dtsi
>> index 2595df8..6aff19f 100644
>> --- a/arch/mips/boot/dts/ingenic/x1830.dtsi
>> +++ b/arch/mips/boot/dts/ingenic/x1830.dtsi
>> @@ -355,7 +355,7 @@
>>      };
>>
>>      otg: usb@13500000 {
>> -        compatible = "ingenic,x1830-otg", "snps,dwc2";
>> +        compatible = "ingenic,x1830-otg";
>>          reg = <0x13500000 0x40000>;
>>
>>          interrupt-parent = <&intc>;
>> -- 
>> 2.7.4
>>
>
Paul Cercueil April 16, 2022, 4:34 p.m. UTC | #3 
Hi Zhou,

Le sam., avril 16 2022 at 20:16:33 +0800, Zhou Yanjie 
<zhouyanjie@wanyeetech.com> a écrit :
> Hi Paul,
> 
> On 2022/4/15 下午11:07, Paul Cercueil wrote:
>> Hi Zhou,
>> 
>> 
>> Le ven., avril 15 2022 at 03:25:37 +0800, 周琰杰 (Zhou Yanjie) 
>> <zhouyanjie@wanyeetech.com> a écrit :
>>> Refresh USB nodes in the jz4780.dtsi, x1000.dtsi, and x1830.dtsi 
>>> files.
>>> 
>>> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
>>> ---
>>> 
>>> Notes:
>>>     v3:
>>>     New patch.
>>> 
>>>  arch/mips/boot/dts/ingenic/jz4780.dtsi | 2 +-
>>>  arch/mips/boot/dts/ingenic/x1000.dtsi  | 2 +-
>>>  arch/mips/boot/dts/ingenic/x1830.dtsi  | 2 +-
>>>  3 files changed, 3 insertions(+), 3 deletions(-)
>>> 
>>> diff --git a/arch/mips/boot/dts/ingenic/jz4780.dtsi 
>>> b/arch/mips/boot/dts/ingenic/jz4780.dtsi
>>> index b998301..c182a65 100644
>>> --- a/arch/mips/boot/dts/ingenic/jz4780.dtsi
>>> +++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi
>>> @@ -577,7 +577,7 @@
>>>      };
>>> 
>>>      otg: usb@13500000 {
>>> -        compatible = "ingenic,jz4780-otg", "snps,dwc2";
>>> +        compatible = "ingenic,jz4780-otg";
>> 
>> Could you refresh my memory - why are the "snps,dwc2" fallback 
>> strings removed?
>> 
>> To me it seems like they should be here, since the OTG IP in Ingenic 
>> SoCs is derived from the DWC2 IP.
> 
> 
> The reason is that Nikolaus found that the current jz4780.dtsi will 
> cause
> dtbscheck to complain. After discussion, Nikolaus concluded three 
> feasible
> solutions, see here:
> https://lkml.org/lkml/2022/4/13/1097
> 
> And it seems that Krzysztof prefers the c) option.

Understood.

-Paul

> 
> Thanks and best regards!
> 
> 
>> 
>> Cheers,
>> -Paul
>> 
>>>          reg = <0x13500000 0x40000>;
>>> 
>>>          interrupt-parent = <&intc>;
>>> diff --git a/arch/mips/boot/dts/ingenic/x1000.dtsi 
>>> b/arch/mips/boot/dts/ingenic/x1000.dtsi
>>> index 8bd27ede..343818a2 100644
>>> --- a/arch/mips/boot/dts/ingenic/x1000.dtsi
>>> +++ b/arch/mips/boot/dts/ingenic/x1000.dtsi
>>> @@ -366,7 +366,7 @@
>>>      };
>>> 
>>>      otg: usb@13500000 {
>>> -        compatible = "ingenic,x1000-otg", "snps,dwc2";
>>> +        compatible = "ingenic,x1000-otg";
>>>          reg = <0x13500000 0x40000>;
>>> 
>>>          interrupt-parent = <&intc>;
>>> diff --git a/arch/mips/boot/dts/ingenic/x1830.dtsi 
>>> b/arch/mips/boot/dts/ingenic/x1830.dtsi
>>> index 2595df8..6aff19f 100644
>>> --- a/arch/mips/boot/dts/ingenic/x1830.dtsi
>>> +++ b/arch/mips/boot/dts/ingenic/x1830.dtsi
>>> @@ -355,7 +355,7 @@
>>>      };
>>> 
>>>      otg: usb@13500000 {
>>> -        compatible = "ingenic,x1830-otg", "snps,dwc2";
>>> +        compatible = "ingenic,x1830-otg";
>>>          reg = <0x13500000 0x40000>;
>>> 
>>>          interrupt-parent = <&intc>;
>>> --
>>> 2.7.4
>>> 
>>
diff mbox series

Patch

diff --git a/arch/mips/boot/dts/ingenic/jz4780.dtsi b/arch/mips/boot/dts/ingenic/jz4780.dtsi
index b998301..c182a65 100644
--- a/arch/mips/boot/dts/ingenic/jz4780.dtsi
+++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi
@@ -577,7 +577,7 @@ 
 	};
 
 	otg: usb@13500000 {
-		compatible = "ingenic,jz4780-otg", "snps,dwc2";
+		compatible = "ingenic,jz4780-otg";
 		reg = <0x13500000 0x40000>;
 
 		interrupt-parent = <&intc>;
diff --git a/arch/mips/boot/dts/ingenic/x1000.dtsi b/arch/mips/boot/dts/ingenic/x1000.dtsi
index 8bd27ede..343818a2 100644
--- a/arch/mips/boot/dts/ingenic/x1000.dtsi
+++ b/arch/mips/boot/dts/ingenic/x1000.dtsi
@@ -366,7 +366,7 @@ 
 	};
 
 	otg: usb@13500000 {
-		compatible = "ingenic,x1000-otg", "snps,dwc2";
+		compatible = "ingenic,x1000-otg";
 		reg = <0x13500000 0x40000>;
 
 		interrupt-parent = <&intc>;
diff --git a/arch/mips/boot/dts/ingenic/x1830.dtsi b/arch/mips/boot/dts/ingenic/x1830.dtsi
index 2595df8..6aff19f 100644
--- a/arch/mips/boot/dts/ingenic/x1830.dtsi
+++ b/arch/mips/boot/dts/ingenic/x1830.dtsi
@@ -355,7 +355,7 @@ 
 	};
 
 	otg: usb@13500000 {
-		compatible = "ingenic,x1830-otg", "snps,dwc2";
+		compatible = "ingenic,x1830-otg";
 		reg = <0x13500000 0x40000>;
 
 		interrupt-parent = <&intc>;