[PATCH] arm64: dts: rockchip: fix second M.2 slot on ROCK 5T

Nicolas Frattaroli posted 1 patch 1 month, 1 week ago
arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
[PATCH] arm64: dts: rockchip: fix second M.2 slot on ROCK 5T
Posted by Nicolas Frattaroli 1 month, 1 week ago
The Radxa ROCK 5T has two M.2 slots, much like the Radxa Rock 5B+. As it
stands, the board won't be able to use PCIe3 if the second M.2 slot is
in use.

Fix this by adding the necessary node enablement and data-lanes property
to the ROCK 5T device tree, mirroring what's in the ROCK 5B+ device
tree.

Reported-by: FUKAUMI Naoki <naoki@radxa.com>
Closes: https://libera.catirclogs.org/linux-rockchip/2025-08-25#38610630;
Fixes: 0ea651de9b79 ("arm64: dts: rockchip: add ROCK 5T device tree")
Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
---
 arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
index 258c7400301d7f77517197ab433946bbfa39cf63..d061fbc897552401df1a73da12fc0614d7edc2d3 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
@@ -68,6 +68,22 @@ &pcie2x1l1 {
 	status = "okay";
 };
 
+&pcie30phy {
+	data-lanes = <1 1 2 2>;
+};
+
+&pcie3x2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie3x2_rst>;
+	reset-gpios = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
+	vpcie3v3-supply = <&vcc3v3_pcie30>;
+	status = "okay";
+};
+
+&pcie3x4 {
+	num-lanes = <2>;
+};
+
 &pinctrl {
 	hdmirx {
 		hdmirx_hpd: hdmirx-5v-detection {
@@ -90,6 +106,12 @@ pcie2_0_vcc3v3_en: pcie2-0-vcc-en {
 		};
 	};
 
+	pcie3 {
+		pcie3x2_rst: pcie3x2-rst {
+			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
 	sound {
 		hp_detect: hp-detect {
 			rockchip,pins = <4 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;

---
base-commit: 89d926fa53d0a6c257c4e8ac1c00c3d9a194ef31
change-id: 20250825-rock5t-second-m2-fix-1fe5c5b8f8d0

Best regards,
-- 
Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
Re: [PATCH] arm64: dts: rockchip: fix second M.2 slot on ROCK 5T
Posted by Heiko Stuebner 1 month ago
On Tue, 26 Aug 2025 10:08:36 +0200, Nicolas Frattaroli wrote:
> The Radxa ROCK 5T has two M.2 slots, much like the Radxa Rock 5B+. As it
> stands, the board won't be able to use PCIe3 if the second M.2 slot is
> in use.
> 
> Fix this by adding the necessary node enablement and data-lanes property
> to the ROCK 5T device tree, mirroring what's in the ROCK 5B+ device
> tree.
> 
> [...]

Applied, thanks!

[1/1] arm64: dts: rockchip: fix second M.2 slot on ROCK 5T
      commit: 5567a036d1b00fb3c6c77bbbd2944291afe1938e

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>