.../dts/rockchip/rk3568-fastrhino-r66s.dts | 6 ++- .../dts/rockchip/rk3568-fastrhino-r66s.dtsi | 48 ++++++------------- .../dts/rockchip/rk3568-fastrhino-r68s.dts | 30 ++++++------ 3 files changed, 33 insertions(+), 51 deletions(-)
Changes in v2:
Separate commits for regulator and supply changes
Separate commits for R68S Ethernet PHY changes
Chukun Pan (9):
arm64: dts: rockchip: fix regulator name for Lunzn Fastrhino R6xS
arm64: dts: rockchip: fix usb regulator for Lunzn Fastrhino R6xS
arm64: dts: rockchip: fix pmu_io supply for Lunzn Fastrhino R6xS
arm64: dts: rockchip: remove unused usb2 nodes for Lunzn Fastrhino
R6xS
arm64: dts: rockchip: disable display subsystem for Lunzn Fastrhino
R6xS
arm64: dts: rockchip: fixes PHY reset for Lunzn Fastrhino R68S
arm64: dts: rockchip: use generic Ethernet PHY reset bindings for
Lunzn Fastrhino R68S
arm64: dts: rockchip: remove useless tx/rx_delay for Lunzn Fastrhino
R68S
arm64: dts: rockchip: Enable UHS-I SDR-50 for Lunzn FastRhino R66S
.../dts/rockchip/rk3568-fastrhino-r66s.dts | 6 ++-
.../dts/rockchip/rk3568-fastrhino-r66s.dtsi | 48 ++++++-------------
.../dts/rockchip/rk3568-fastrhino-r68s.dts | 30 ++++++------
3 files changed, 33 insertions(+), 51 deletions(-)
--
2.25.1
Sorry for the noise, I don't know why some patches were not sent successfully, so I resent them. -- 2.25.1
Remove the non-existent usb_host regulator and fix the supply according
to the schematic. Also remove the unnecessary always-on and boot-on for
the usb_otg regulator.
Fixes: c79dab407afd ("arm64: dts: rockchip: Add Lunzn Fastrhino R66S")
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
---
.../boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi
index 93987c8740f7..8f587978fa3b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi
@@ -78,15 +78,6 @@ vcc5v0_sys: vcc5v0-sys-regulator {
vin-supply = <&vcc12v_dcin>;
};
- vcc5v0_usb_host: vcc5v0-usb-host-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vcc5v0_usb_host";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- };
-
vcc5v0_usb_otg: vcc5v0-usb-otg-regulator {
compatible = "regulator-fixed";
enable-active-high;
@@ -94,8 +85,9 @@ vcc5v0_usb_otg: vcc5v0-usb-otg-regulator {
pinctrl-names = "default";
pinctrl-0 = <&vcc5v0_usb_otg_en>;
regulator-name = "vcc5v0_usb_otg";
- regulator-always-on;
- regulator-boot-on;
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ vin-supply = <&vcc5v0_sys>;
};
};
@@ -460,7 +452,7 @@ &usb2phy0 {
};
&usb2phy0_host {
- phy-supply = <&vcc5v0_usb_host>;
+ phy-supply = <&vcc5v0_sys>;
status = "okay";
};
--
2.25.1
The R66S and R68S boards do not have HDMI output, so disable
the display subsystem.
Fixes: c79dab407afd ("arm64: dts: rockchip: Add Lunzn Fastrhino R66S")
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
---
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi
index e08c9eab6f17..25c49bdbadbc 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi
@@ -115,6 +115,10 @@ &cpu3 {
cpu-supply = <&vdd_cpu>;
};
+&display_subsystem {
+ status = "disabled";
+};
+
&gpu {
mali-supply = <&vdd_gpu>;
status = "okay";
--
2.25.1
Replace the deprecated snps,reset-xxx bindings to the generic Ethernet
PHY reset GPIO bindings. Also updates the delays based on the vendor
recommendations.
Fixes: b9f8ca655d80 ("arm64: dts: rockchip: Add Lunzn Fastrhino R68S")
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
---
.../boot/dts/rockchip/rk3568-fastrhino-r68s.dts | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts
index ce2a5e1ccefc..02d966d218fd 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts
@@ -39,10 +39,6 @@ &gmac0_tx_bus2
&gmac0_rx_bus2
&gmac0_rgmii_clk
&gmac0_rgmii_bus>;
- snps,reset-gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>;
- snps,reset-active-low;
- /* Reset time is 15ms, 50ms for rtl8211f */
- snps,reset-delays-us = <0 15000 50000>;
tx_delay = <0x3c>;
rx_delay = <0x2f>;
status = "okay";
@@ -61,10 +57,6 @@ &gmac1m1_tx_bus2
&gmac1m1_rx_bus2
&gmac1m1_rgmii_clk
&gmac1m1_rgmii_bus>;
- snps,reset-gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_LOW>;
- snps,reset-active-low;
- /* Reset time is 15ms, 50ms for rtl8211f */
- snps,reset-delays-us = <0 15000 50000>;
tx_delay = <0x4f>;
rx_delay = <0x26>;
status = "okay";
@@ -76,6 +68,9 @@ rgmii_phy0: ethernet-phy@1 {
reg = <0x1>;
pinctrl-0 = <ð_phy0_reset_pin>;
pinctrl-names = "default";
+ reset-assert-us = <20000>;
+ reset-deassert-us = <100000>;
+ reset-gpios = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>;
};
};
@@ -85,6 +80,9 @@ rgmii_phy1: ethernet-phy@1 {
reg = <0x1>;
pinctrl-0 = <ð_phy1_reset_pin>;
pinctrl-names = "default";
+ reset-assert-us = <20000>;
+ reset-deassert-us = <100000>;
+ reset-gpios = <&gpio1 RK_PB1 GPIO_ACTIVE_LOW>;
};
};
--
2.25.1
On Sun, 30 Jun 2024 23:00:01 +0800, Chukun Pan wrote:
> Changes in v2:
> Separate commits for regulator and supply changes
> Separate commits for R68S Ethernet PHY changes
>
> Chukun Pan (9):
> arm64: dts: rockchip: fix regulator name for Lunzn Fastrhino R6xS
> arm64: dts: rockchip: fix usb regulator for Lunzn Fastrhino R6xS
> arm64: dts: rockchip: fix pmu_io supply for Lunzn Fastrhino R6xS
> arm64: dts: rockchip: remove unused usb2 nodes for Lunzn Fastrhino
> R6xS
> arm64: dts: rockchip: disable display subsystem for Lunzn Fastrhino
> R6xS
> arm64: dts: rockchip: fixes PHY reset for Lunzn Fastrhino R68S
> arm64: dts: rockchip: use generic Ethernet PHY reset bindings for
> Lunzn Fastrhino R68S
> arm64: dts: rockchip: remove useless tx/rx_delay for Lunzn Fastrhino
> R68S
> arm64: dts: rockchip: Enable UHS-I SDR-50 for Lunzn FastRhino R66S
>
> [...]
Applied, thanks!
[1/9] arm64: dts: rockchip: fix regulator name for Lunzn Fastrhino R6xS
commit: 2dad31528de9ea8b05245ce6ac4f76ebf8dae947
[2/9] arm64: dts: rockchip: fix usb regulator for Lunzn Fastrhino R6xS
commit: 9e823ba92118510c0d1c050b67bb000f9b9a73d7
[3/9] arm64: dts: rockchip: fix pmu_io supply for Lunzn Fastrhino R6xS
commit: cfeac8e5d05815521f5c5568680735a92ee91fe4
[4/9] arm64: dts: rockchip: remove unused usb2 nodes for Lunzn Fastrhino R6xS
commit: cd77139a307fbabe75e6b5cb8a3753e3c700f394
[5/9] arm64: dts: rockchip: disable display subsystem for Lunzn Fastrhino R6xS
commit: 2bf5d445df2ec89689d15ea259a916260c936959
[6/9] arm64: dts: rockchip: fixes PHY reset for Lunzn Fastrhino R68S
commit: e261bd74000ca80e5483ba8a8bda509de8cbe7fd
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
© 2016 - 2025 Red Hat, Inc.