Skip to contentSkip to conversation

arm64: dts: rockchip: several fixes for the nanopi r3s

PATCH Applied Tianling Shen 2 participants 7 messages Oct 22, 2024 – Oct 24, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover arm64: dts: rockchip: several fixes for the nanopi r3s

* Enable eMMC HS200 mode to allow it boot from eMMC
* Sort properties in pmu_io_domains node
* Reorder mmc aliases
* Replace deprecated snps,reset properties
* Use the marketing name for the model name
* Update the website url in copyright

Thanks Jonas Karlman for the review and suggestions :)

Tianling Shen (5):
arm64: dts: rockchip: fix model name for FriendlyElec NanoPi R3S
arm64: dts: rockchip: replace deprecated snps,reset props for NanoPi

    R3S

arm64: dts: rockchip: sort props in pmu_io_domains node for NanoPi R3S
arm64: dts: rockchip: enable eMMC HS200 mode for NanoPi R3S
arm64: dts: rockchip: reorder mmc aliases for NanoPi R3S

 .../boot/dts/rockchip/rk3566-nanopi-r3s.dts    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
Signature · 1 line
2.47.0
#1 lore raw

PATCH 1/5 arm64: dts: rockchip: fix model name for FriendlyElec NanoPi R3S

Use the marketing name for model name, this matches the dt-binding. Also update the website url in copyright.

Fixes 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board")
---
 arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts +2 -2
index a7a55d68dbb6..6bc17f755b79 100644
@@ -3,7 +3,7 @@
  * Copyright (c) 2020 Rockchip Electronics Co., Ltd.
  *
  * Copyright (c) 2024 FriendlyElec Computer Tech. Co., Ltd.
- * (http://www.friendlyarm.com)
+ * (http://www.friendlyelec.com)
  *
  * Copyright (c) 2024 Tianling Shen <[email protected]>
  */
@@ -17,7 +17,7 @@
 #include "rk3566.dtsi"
 
 / {
-	model = "FriendlyARM NanoPi R3S";
+	model = "FriendlyElec NanoPi R3S";
 	compatible = "friendlyarm,nanopi-r3s", "rockchip,rk3566";
 
 	aliases {
Signature · 1 line
2.47.0
#2 lore raw

PATCH 2/5 arm64: dts: rockchip: replace deprecated snps,reset props for NanoPi R3S

In reply to Tianling Shen

Replace deprecated snps,reset props and move them to the PHY node.

Fixes 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board")
---
 arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts +3 -4
index 6bc17f755b79..66a00cddda0c 100644
@@ -149,10 +149,6 @@ &gmac1m0_tx_bus2_level3
 		     &gmac1m0_rx_bus2
 		     &gmac1m0_rgmii_clk_level2
 		     &gmac1m0_rgmii_bus_level3>;
-	snps,reset-gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>;
-	snps,reset-active-low;
-	/* Reset time is 20ms, 100ms for rtl8211f */
-	snps,reset-delays-us = <0 20000 100000>;
 	status = "okay";
 };
 
@@ -414,6 +410,9 @@ rgmii_phy1: ethernet-phy@1 {
 		interrupts = <RK_PC3 IRQ_TYPE_LEVEL_LOW>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&eth_phy_reset_pin>;
+		reset-assert-us = <20000>;
+		reset-deassert-us = <100000>;
+		reset-gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>;
 	};
 };
 
Signature · 1 line
2.47.0
#3 lore raw

PATCH 3/5 arm64: dts: rockchip: sort props in pmu_io_domains node for NanoPi R3S

In reply to Tianling Shen

The status prop is typically the last prop.

Fixes 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board")
---
 arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts +1 -1
index 66a00cddda0c..243574f8da78 100644
@@ -476,7 +476,6 @@ vcc5v0_usb_host_en: vcc5v0-usb-host-en {
 };
 
 &pmu_io_domains {
-	status = "okay";
 	pmuio1-supply = <&vcc3v3_pmu>;
 	pmuio2-supply = <&vcc3v3_pmu>;
 	vccio1-supply = <&vccio_acodec>;
@@ -486,6 +485,7 @@ &pmu_io_domains {
 	vccio5-supply = <&vcc_1v8>;
 	vccio6-supply = <&vcc_3v3>;
 	vccio7-supply = <&vcc_3v3>;
+	status = "okay";
 };
 
 &sdhci {
Signature · 1 line
2.47.0
#4 lore raw

PATCH 4/5 arm64: dts: rockchip: enable eMMC HS200 mode for NanoPi R3S

In reply to Tianling Shen

It is required to boot from eMMC without additional patch in u-boot.

Fixes 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board")
---
 arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts +1 -0
index 243574f8da78..03a2f90f6217 100644
@@ -491,6 +491,7 @@ &pmu_io_domains {
 &sdhci {
 	bus-width = <8>;
 	max-frequency = <200000000>;
+	mmc-hs200-1_8v;
 	non-removable;
 	pinctrl-names = "default";
 	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
Signature · 1 line
2.47.0
#5 lore raw

PATCH 5/5 arm64: dts: rockchip: reorder mmc aliases for NanoPi R3S

In reply to Tianling Shen

Typically any non-removable storage (emmc) is listed before removable storage (sd-card) options. Also U-Boot will try to override and use mmc0=sdhci and mmc1=sdmmc0 for all rk356x boards.

Fixes 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board")
---
 arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts +2 -2
index 03a2f90f6217..fb1f65c86883 100644
@@ -22,8 +22,8 @@ / {
 
 	aliases {
 		ethernet0 = &gmac1;
-		mmc0 = &sdmmc0;
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc0;
 	};
 
 	chosen: chosen {
Signature · 1 line
2.47.0
maintainer Applied
#6 lore raw
In reply to Tianling Shen
Quoted 8 lines · Tianling Shen

* Enable eMMC HS200 mode to allow it boot from eMMC
* Sort properties in pmu_io_domains node
* Reorder mmc aliases
* Replace deprecated snps,reset properties
* Use the marketing name for the model name
* Update the website url in copyright

[...]

Applied, thanks!

[1/5] arm64: dts: rockchip: fix model name for FriendlyElec NanoPi R3S

      commit: b5bf84206a5c77528f9dd4cbca4e72caa063c102
[2/5] arm64: dts: rockchip: replace deprecated snps,reset props for NanoPi R3S
      commit: 82b2868937883b65732da498b26366d34db61510
[3/5] arm64: dts: rockchip: sort props in pmu_io_domains node for NanoPi R3S
      commit: 17e150fdd983c7e59b9240e34a166285f3c3fb39
[4/5] arm64: dts: rockchip: enable eMMC HS200 mode for NanoPi R3S
      commit: 1b5365034410f1ca21adadadd492b99bdf4f2c55
[5/5] arm64: dts: rockchip: reorder mmc aliases for NanoPi R3S
      commit: b7cd1115456d312f8c5e60c80fdc35fd35ea6eab

Best regards,

Signature · 1 line
Heiko Stuebner <[email protected]>