[PATCH 1/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi 4B

[PATCH 1/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi 4B

[Andy Yan]

Follow others rk3588 based boards, and u-boot only use mmc0/1
as mmc boot targets, so aliase sdmmc as mmc1.

Fixes: 3f5d336d64d6 ("arm64: dts: rockchip: Add support for rk3588s based board Cool Pi 4B")
Signed-off-by: Andy Yan <andyshrk@163.com>
---

 arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
index 3fae40b9ae1b..3b9d21a6f8bf 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
@@ -20,8 +20,8 @@ / {
 
 	aliases {
 		mmc0 = &sdhci;
-		mmc1 = &sdio;
-		mmc2 = &sdmmc;
+		mmc1 = &sdmmc;
+		mmc2 = &sdio;
 	};
 
 	analog-sound {
-- 
2.34.1

[PATCH 2/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi CM5 EVB

[Andy Yan]

Follow others rk3588 based boards, and u-boot only use mmc0/1
as mmc boot targets, so aliase sdmmc as mmc1.

Fixes: 791c154c3982 ("arm64: dts: rockchip: Add support for rk3588 based board Cool Pi CM5 EVB")
Signed-off-by: Andy Yan <andyshrk@163.com>
---

 arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
index 0b02f4d6e003..cce1c8e83587 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
@@ -16,8 +16,8 @@ / {
 
 	aliases {
 		mmc0 = &sdhci;
-		mmc1 = &sdio;
-		mmc2 = &sdmmc;
+		mmc1 = &sdmmc;
+		mmc2 = &sdio;
 		serial2 = &uart2;
 	};
 
-- 
2.34.1

Re: [PATCH 2/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi CM5 EVB

[Dragan Simic]

On 2024-01-27 10:20, Andy Yan wrote:
> Follow others rk3588 based boards, and u-boot only use mmc0/1
> as mmc boot targets, so aliase sdmmc as mmc1.
> 
> Fixes: 791c154c3982 ("arm64: dts: rockchip: Add support for rk3588
> based board Cool Pi CM5 EVB")
> Signed-off-by: Andy Yan <andyshrk@163.com>

Makes sense to me.

Reviewed-by: Dragan Simic <dsimic@manjaro.org>

> ---
> 
>  arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
> b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
> index 0b02f4d6e003..cce1c8e83587 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
> @@ -16,8 +16,8 @@ / {
> 
>  	aliases {
>  		mmc0 = &sdhci;
> -		mmc1 = &sdio;
> -		mmc2 = &sdmmc;
> +		mmc1 = &sdmmc;
> +		mmc2 = &sdio;
>  		serial2 = &uart2;
>  	};

[PATCH 3/4] arm64: dts: rockchip: rename vcc5v0_usb30_host regulator for Cool Pi CM5 EVB

[Andy Yan]

According to the schematic, this regulator is used both for USB30 and
USB20, so give it a more appropriate name.

Fixes: 791c154c3982 ("arm64: dts: rockchip: Add support for rk3588 based board Cool Pi CM5 EVB")
Signed-off-by: Andy Yan <andyshrk@163.com>
---

 arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
index 1b5681fe0471..5f42f1065d73 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
@@ -84,7 +84,7 @@ vcc3v3_lcd: vcc3v3-lcd-regulator {
 		vin-supply = <&vcc3v3_sys>;
 	};
 
-	vcc5v0_usb30_host: vcc5v0-usb30-host-regulator {
+	vcc5v0_usb_host: vcc5v0-usb-host-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc5v0_host";
 		regulator-boot-on;
@@ -200,12 +200,12 @@ &u2phy3 {
 };
 
 &u2phy2_host {
-	phy-supply = <&vcc5v0_usb30_host>;
+	phy-supply = <&vcc5v0_usb_host>;
 	status = "okay";
 };
 
 &u2phy3_host {
-	phy-supply = <&vcc5v0_usb30_host>;
+	phy-supply = <&vcc5v0_usb_host>;
 	status = "okay";
 };
 
-- 
2.34.1

Re: [PATCH 3/4] arm64: dts: rockchip: rename vcc5v0_usb30_host regulator for Cool Pi CM5 EVB

[Heiko Stübner]

Hi Andy,

Am Samstag, 27. Januar 2024, 10:20:33 CET schrieb Andy Yan:
> According to the schematic, this regulator is used both for USB30 and
> USB20, so give it a more appropriate name.

I don't have the schematics, so I'll need you to answer this, but what
is the regulator called _in_ the schematics?

I.e. we want regulators to really be named the same as in the schematic
so people can look up thing from the dts in the schematics and the other
way around too.


Thanks
Heiko


> Fixes: 791c154c3982 ("arm64: dts: rockchip: Add support for rk3588 based board Cool Pi CM5 EVB")
> Signed-off-by: Andy Yan <andyshrk@163.com>
> ---
> 
>  arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
> index 1b5681fe0471..5f42f1065d73 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
> @@ -84,7 +84,7 @@ vcc3v3_lcd: vcc3v3-lcd-regulator {
>  		vin-supply = <&vcc3v3_sys>;
>  	};
>  
> -	vcc5v0_usb30_host: vcc5v0-usb30-host-regulator {
> +	vcc5v0_usb_host: vcc5v0-usb-host-regulator {
>  		compatible = "regulator-fixed";
>  		regulator-name = "vcc5v0_host";
>  		regulator-boot-on;
> @@ -200,12 +200,12 @@ &u2phy3 {
>  };
>  
>  &u2phy2_host {
> -	phy-supply = <&vcc5v0_usb30_host>;
> +	phy-supply = <&vcc5v0_usb_host>;
>  	status = "okay";
>  };
>  
>  &u2phy3_host {
> -	phy-supply = <&vcc5v0_usb30_host>;
> +	phy-supply = <&vcc5v0_usb_host>;
>  	status = "okay";
>  };
>  
> 

Re:Re: [PATCH 3/4] arm64: dts: rockchip: rename vcc5v0_usb30_host regulator for Cool Pi CM5 EVB

[Andy Yan]

Hi Heiko：

At 2024-01-27 18:36:40, "Heiko Stübner" <heiko@sntech.de> wrote:
>Hi Andy,
>
>Am Samstag, 27. Januar 2024, 10:20:33 CET schrieb Andy Yan:
>> According to the schematic, this regulator is used both for USB30 and
>> USB20, so give it a more appropriate name.
>
>I don't have the schematics, so I'll need you to answer this, but what
>is the regulator called _in_ the schematics?

There are two regulators called VCC50_USB_HOST1 and VCC50_USB_HOST2, and they are both controlled by GPIO1_D5
They both for two usb 2.0 hosts,  not usb 30, the schematics make
 me a bit confused.

>
>I.e. we want regulators to really be named the same as in the schematic
>so people can look up thing from the dts in the schematics and the other
>way around too.
>
>
>Thanks
>Heiko
>
>
>> Fixes: 791c154c3982 ("arm64: dts: rockchip: Add support for rk3588 based board Cool Pi CM5 EVB")
>> Signed-off-by: Andy Yan <andyshrk@163.com>
>> ---
>> 
>>  arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>> 
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
>> index 1b5681fe0471..5f42f1065d73 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
>> +++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
>> @@ -84,7 +84,7 @@ vcc3v3_lcd: vcc3v3-lcd-regulator {
>>  		vin-supply = <&vcc3v3_sys>;
>>  	};
>>  
>> -	vcc5v0_usb30_host: vcc5v0-usb30-host-regulator {
>> +	vcc5v0_usb_host: vcc5v0-usb-host-regulator {
>>  		compatible = "regulator-fixed";
>>  		regulator-name = "vcc5v0_host";
>>  		regulator-boot-on;
>> @@ -200,12 +200,12 @@ &u2phy3 {
>>  };
>>  
>>  &u2phy2_host {
>> -	phy-supply = <&vcc5v0_usb30_host>;
>> +	phy-supply = <&vcc5v0_usb_host>;
>>  	status = "okay";
>>  };
>>  
>>  &u2phy3_host {
>> -	phy-supply = <&vcc5v0_usb30_host>;
>> +	phy-supply = <&vcc5v0_usb_host>;
>>  	status = "okay";
>>  };
>>  
>> 
>
>
>
>
>
>_______________________________________________
>linux-arm-kernel mailing list
>linux-arm-kernel@lists.infradead.org
>http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 3/4] arm64: dts: rockchip: rename vcc5v0_usb30_host regulator for Cool Pi CM5 EVB

[Dragan Simic]

On 2024-01-27 13:15, Andy Yan wrote:
> At 2024-01-27 18:36:40, "Heiko Stübner" <heiko@sntech.de> wrote:
>> Am Samstag, 27. Januar 2024, 10:20:33 CET schrieb Andy Yan:
>>> According to the schematic, this regulator is used both for USB30 and
>>> USB20, so give it a more appropriate name.
>> 
>> I don't have the schematics, so I'll need you to answer this, but what
>> is the regulator called _in_ the schematics?
> 
> There are two regulators called VCC50_USB_HOST1 and VCC50_USB_HOST2,
> and they are both controlled by GPIO1_D5
> They both for two usb 2.0 hosts,  not usb 30, the schematics make
> me a bit confused.

In that case, I'd say that renaming the regulator to vcc5v0_usb_host is
fine, but there should also be a comment in the board dts file that it's
actually two separate regulators.

>> I.e. we want regulators to really be named the same as in the 
>> schematic
>> so people can look up thing from the dts in the schematics and the 
>> other
>> way around too.

Ah, that's very helpful.

>>> Fixes: 791c154c3982 ("arm64: dts: rockchip: Add support for rk3588 
>>> based board Cool Pi CM5 EVB")
>>> Signed-off-by: Andy Yan <andyshrk@163.com>
>>> ---
>>> 
>>>  arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts | 6 +++---
>>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>> 
>>> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts 
>>> b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
>>> index 1b5681fe0471..5f42f1065d73 100644
>>> --- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
>>> +++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
>>> @@ -84,7 +84,7 @@ vcc3v3_lcd: vcc3v3-lcd-regulator {
>>>  		vin-supply = <&vcc3v3_sys>;
>>>  	};
>>> 
>>> -	vcc5v0_usb30_host: vcc5v0-usb30-host-regulator {
>>> +	vcc5v0_usb_host: vcc5v0-usb-host-regulator {
>>>  		compatible = "regulator-fixed";
>>>  		regulator-name = "vcc5v0_host";
>>>  		regulator-boot-on;
>>> @@ -200,12 +200,12 @@ &u2phy3 {
>>>  };
>>> 
>>>  &u2phy2_host {
>>> -	phy-supply = <&vcc5v0_usb30_host>;
>>> +	phy-supply = <&vcc5v0_usb_host>;
>>>  	status = "okay";
>>>  };
>>> 
>>>  &u2phy3_host {
>>> -	phy-supply = <&vcc5v0_usb30_host>;
>>> +	phy-supply = <&vcc5v0_usb_host>;
>>>  	status = "okay";
>>>  };

Re:Re: [PATCH 3/4] arm64: dts: rockchip: rename vcc5v0_usb30_host regulator for Cool Pi CM5 EVB

[Andy Yan]

Hi Heiko：

在 2024-01-27 21:09:46，"Dragan Simic" <dsimic@manjaro.org> 写道：
>On 2024-01-27 13:15, Andy Yan wrote:
>> At 2024-01-27 18:36:40, "Heiko Stübner" <heiko@sntech.de> wrote:
>>> Am Samstag, 27. Januar 2024, 10:20:33 CET schrieb Andy Yan:
>>>> According to the schematic, this regulator is used both for USB30 and
>>>> USB20, so give it a more appropriate name.
>>> 
>>> I don't have the schematics, so I'll need you to answer this, but what
>>> is the regulator called _in_ the schematics?
>> 
>> There are two regulators called VCC50_USB_HOST1 and VCC50_USB_HOST2,
>> and they are both controlled by GPIO1_D5
>> They both for two usb 2.0 hosts,  not usb 30, the schematics make
>> me a bit confused.
>
>In that case, I'd say that renaming the regulator to vcc5v0_usb_host is
>fine, but there should also be a comment in the board dts file that it's
>actually two separate regulators.

How do you feel about this ？ Or some other style like：
vcc5v0_usb_host1: vcc5v0_usb_host2：vcc5v0-usb-host-regulator {


>
>>> I.e. we want regulators to really be named the same as in the 
>>> schematic
>>> so people can look up thing from the dts in the schematics and the 
>>> other
>>> way around too.
>
>Ah, that's very helpful.
>
>>>> Fixes: 791c154c3982 ("arm64: dts: rockchip: Add support for rk3588 
>>>> based board Cool Pi CM5 EVB")
>>>> Signed-off-by: Andy Yan <andyshrk@163.com>
>>>> ---
>>>> 
>>>>  arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts | 6 +++---
>>>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>>> 
>>>> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts 
>>>> b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
>>>> index 1b5681fe0471..5f42f1065d73 100644
>>>> --- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
>>>> +++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
>>>> @@ -84,7 +84,7 @@ vcc3v3_lcd: vcc3v3-lcd-regulator {
>>>>  		vin-supply = <&vcc3v3_sys>;
>>>>  	};
>>>> 
>>>> -	vcc5v0_usb30_host: vcc5v0-usb30-host-regulator {
>>>> +	vcc5v0_usb_host: vcc5v0-usb-host-regulator {
>>>>  		compatible = "regulator-fixed";
>>>>  		regulator-name = "vcc5v0_host";
>>>>  		regulator-boot-on;
>>>> @@ -200,12 +200,12 @@ &u2phy3 {
>>>>  };
>>>> 
>>>>  &u2phy2_host {
>>>> -	phy-supply = <&vcc5v0_usb30_host>;
>>>> +	phy-supply = <&vcc5v0_usb_host>;
>>>>  	status = "okay";
>>>>  };
>>>> 
>>>>  &u2phy3_host {
>>>> -	phy-supply = <&vcc5v0_usb30_host>;
>>>> +	phy-supply = <&vcc5v0_usb_host>;
>>>>  	status = "okay";
>>>>  };
>
>_______________________________________________
>linux-arm-kernel mailing list
>linux-arm-kernel@lists.infradead.org
>http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 3/4] arm64: dts: rockchip: rename vcc5v0_usb30_host regulator for Cool Pi CM5 EVB

[Heiko Stübner]

Am Mittwoch, 31. Januar 2024, 13:21:56 CET schrieb Andy Yan:
> 
> Hi Heiko：
> 
> 在 2024-01-27 21:09:46，"Dragan Simic" <dsimic@manjaro.org> 写道：
> >On 2024-01-27 13:15, Andy Yan wrote:
> >> At 2024-01-27 18:36:40, "Heiko Stübner" <heiko@sntech.de> wrote:
> >>> Am Samstag, 27. Januar 2024, 10:20:33 CET schrieb Andy Yan:
> >>>> According to the schematic, this regulator is used both for USB30 and
> >>>> USB20, so give it a more appropriate name.
> >>> 
> >>> I don't have the schematics, so I'll need you to answer this, but what
> >>> is the regulator called _in_ the schematics?
> >> 
> >> There are two regulators called VCC50_USB_HOST1 and VCC50_USB_HOST2,
> >> and they are both controlled by GPIO1_D5
> >> They both for two usb 2.0 hosts,  not usb 30, the schematics make
> >> me a bit confused.
> >
> >In that case, I'd say that renaming the regulator to vcc5v0_usb_host is
> >fine, but there should also be a comment in the board dts file that it's
> >actually two separate regulators.
> 
> How do you feel about this ？ Or some other style like：
> vcc5v0_usb_host1: vcc5v0_usb_host2：vcc5v0-usb-host-regulator {

I think we're using such a scheme in some places already, and
yes I really like going this way. So that the phandles follow the
schematic names and we can still grep for things.


Heiko

[PATCH 4/4] arm64: dts: rockchip: Fix the num-lanes of pcie3x4 on Cool Pi CM5 EVB

[Andy Yan]

The 4 lane pcie30 phy is shared by pcie3x4 and pcie3x2, so
the num-lanes of pcie3x4 should be 2.

Fixes: 791c154c3982 ("arm64: dts: rockchip: Add support for rk3588 based board Cool Pi CM5 EVB")
Signed-off-by: Andy Yan <andyshrk@163.com>
---

 arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
index 5f42f1065d73..9bff04fc7e43 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
@@ -126,6 +126,7 @@ &pcie30phy {
 	status = "okay";
 };
 
+/* Standard pcie */
 &pcie3x2 {
 	reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_HIGH>;
 	vpcie3v3-supply = <&vcc3v3_sys>;
@@ -134,6 +135,7 @@ &pcie3x2 {
 
 /* M.2 M-Key ssd */
 &pcie3x4 {
+	num-lanes = <2>;
 	reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
 	vpcie3v3-supply = <&vcc3v3_sys>;
 	status = "okay";
-- 
2.34.1

Re: [PATCH 1/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi 4B

[Dragan Simic]

On 2024-01-27 10:20, Andy Yan wrote:
> Follow others rk3588 based boards, and u-boot only use mmc0/1
> as mmc boot targets, so aliase sdmmc as mmc1.
> 
> Fixes: 3f5d336d64d6 ("arm64: dts: rockchip: Add support for rk3588s
> based board Cool Pi 4B")
> Signed-off-by: Andy Yan <andyshrk@163.com>

Makes sense to me.

Reviewed-by: Dragan Simic <dsimic@manjaro.org>

> ---
> 
>  arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
> b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
> index 3fae40b9ae1b..3b9d21a6f8bf 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
> @@ -20,8 +20,8 @@ / {
> 
>  	aliases {
>  		mmc0 = &sdhci;
> -		mmc1 = &sdio;
> -		mmc2 = &sdmmc;
> +		mmc1 = &sdmmc;
> +		mmc2 = &sdio;
>  	};
> 
>  	analog-sound {