* [PATCH v2 1/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi 4B
@ 2024-02-01 12:11 Andy Yan
2024-02-01 12:11 ` [PATCH v2 2/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi CM5 EVB Andy Yan
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Andy Yan @ 2024-02-01 12:11 UTC (permalink / raw)
To: heiko
Cc: krzysztof.kozlowski+dt, robh+dt, devicetree, linux-arm-kernel,
linux-kernel, linux-rockchip, Andy Yan, Dragan Simic
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>
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
---
(no changes since v1)
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
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi CM5 EVB
2024-02-01 12:11 [PATCH v2 1/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi 4B Andy Yan
@ 2024-02-01 12:11 ` Andy Yan
2024-02-01 12:11 ` [PATCH v2 3/4] arm64: dts: rockchip: rename vcc5v0_usb30_host regulator " Andy Yan
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Andy Yan @ 2024-02-01 12:11 UTC (permalink / raw)
To: heiko
Cc: krzysztof.kozlowski+dt, robh+dt, devicetree, linux-arm-kernel,
linux-kernel, linux-rockchip, Andy Yan, Dragan Simic
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>
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
---
(no changes since v1)
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
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/4] arm64: dts: rockchip: rename vcc5v0_usb30_host regulator for Cool Pi CM5 EVB
2024-02-01 12:11 [PATCH v2 1/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi 4B Andy Yan
2024-02-01 12:11 ` [PATCH v2 2/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi CM5 EVB Andy Yan
@ 2024-02-01 12:11 ` Andy Yan
2024-02-01 12:35 ` Dragan Simic
2024-02-01 12:11 ` [PATCH v2 4/4] arm64: dts: rockchip: Fix the num-lanes of pcie3x4 on " Andy Yan
2024-02-04 11:17 ` [PATCH v2 1/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi 4B Heiko Stuebner
3 siblings, 1 reply; 6+ messages in thread
From: Andy Yan @ 2024-02-01 12:11 UTC (permalink / raw)
To: heiko
Cc: krzysztof.kozlowski+dt, robh+dt, devicetree, linux-arm-kernel,
linux-kernel, linux-rockchip, Andy Yan
According to the schematic, USB20 HOST0 and HOST1 each have their own
independent power supply, but these two regulators controlled by a
same GPIO, 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>
---
Changes in v2:
- Add two lable for this regulator
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..9c0f408ef339 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_host1: vcc5v0_usb_host2: 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_host1>;
status = "okay";
};
&u2phy3_host {
- phy-supply = <&vcc5v0_usb30_host>;
+ phy-supply = <&vcc5v0_usb_host2>;
status = "okay";
};
--
2.34.1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 4/4] arm64: dts: rockchip: Fix the num-lanes of pcie3x4 on Cool Pi CM5 EVB
2024-02-01 12:11 [PATCH v2 1/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi 4B Andy Yan
2024-02-01 12:11 ` [PATCH v2 2/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi CM5 EVB Andy Yan
2024-02-01 12:11 ` [PATCH v2 3/4] arm64: dts: rockchip: rename vcc5v0_usb30_host regulator " Andy Yan
@ 2024-02-01 12:11 ` Andy Yan
2024-02-04 11:17 ` [PATCH v2 1/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi 4B Heiko Stuebner
3 siblings, 0 replies; 6+ messages in thread
From: Andy Yan @ 2024-02-01 12:11 UTC (permalink / raw)
To: heiko
Cc: krzysztof.kozlowski+dt, robh+dt, devicetree, linux-arm-kernel,
linux-kernel, linux-rockchip, 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>
---
(no changes since v1)
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 9c0f408ef339..d6366e7b57bb 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
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 3/4] arm64: dts: rockchip: rename vcc5v0_usb30_host regulator for Cool Pi CM5 EVB
2024-02-01 12:11 ` [PATCH v2 3/4] arm64: dts: rockchip: rename vcc5v0_usb30_host regulator " Andy Yan
@ 2024-02-01 12:35 ` Dragan Simic
0 siblings, 0 replies; 6+ messages in thread
From: Dragan Simic @ 2024-02-01 12:35 UTC (permalink / raw)
To: Andy Yan
Cc: heiko, krzysztof.kozlowski+dt, robh+dt, devicetree,
linux-arm-kernel, linux-kernel, linux-rockchip
On 2024-02-01 13:11, Andy Yan wrote:
> According to the schematic, USB20 HOST0 and HOST1 each have their own
> independent power supply, but these two regulators controlled by a
> same GPIO, 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>
Looking good to me.
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
> ---
>
> Changes in v2:
> - Add two lable for this regulator
>
> 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..9c0f408ef339 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_host1: vcc5v0_usb_host2: 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_host1>;
> status = "okay";
> };
>
> &u2phy3_host {
> - phy-supply = <&vcc5v0_usb30_host>;
> + phy-supply = <&vcc5v0_usb_host2>;
> status = "okay";
> };
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi 4B
2024-02-01 12:11 [PATCH v2 1/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi 4B Andy Yan
` (2 preceding siblings ...)
2024-02-01 12:11 ` [PATCH v2 4/4] arm64: dts: rockchip: Fix the num-lanes of pcie3x4 on " Andy Yan
@ 2024-02-04 11:17 ` Heiko Stuebner
3 siblings, 0 replies; 6+ messages in thread
From: Heiko Stuebner @ 2024-02-04 11:17 UTC (permalink / raw)
To: Andy Yan
Cc: Heiko Stuebner, Dragan Simic, linux-kernel,
krzysztof.kozlowski+dt, linux-rockchip, robh+dt, linux-arm-kernel,
devicetree
On Thu, 1 Feb 2024 20:11:03 +0800, Andy Yan wrote:
> Follow others rk3588 based boards, and u-boot only use mmc0/1
> as mmc boot targets, so aliase sdmmc as mmc1.
>
>
Applied, thanks!
[1/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi 4B
commit: a41f91b4da1490b90ae5859f3464e94d418fea2c
[2/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi CM5 EVB
commit: cebda3dd36bebb11d3e6df4d1944a1cdcf3cd4cf
[3/4] arm64: dts: rockchip: rename vcc5v0_usb30_host regulator for Cool Pi CM5 EVB
commit: c7e8dbb3bc12f389d617e6c0e9537f11a1fa6eb1
[4/4] arm64: dts: rockchip: Fix the num-lanes of pcie3x4 on Cool Pi CM5 EVB
commit: 5556a8c3af8b4ee648b0fd4cdb4a1356d92de07b
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-02-04 11:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-01 12:11 [PATCH v2 1/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi 4B Andy Yan
2024-02-01 12:11 ` [PATCH v2 2/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi CM5 EVB Andy Yan
2024-02-01 12:11 ` [PATCH v2 3/4] arm64: dts: rockchip: rename vcc5v0_usb30_host regulator " Andy Yan
2024-02-01 12:35 ` Dragan Simic
2024-02-01 12:11 ` [PATCH v2 4/4] arm64: dts: rockchip: Fix the num-lanes of pcie3x4 on " Andy Yan
2024-02-04 11:17 ` [PATCH v2 1/4] arm64: dts: rockchip: aliase sdmmc as mmc1 for Cool Pi 4B Heiko Stuebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox