Skip to content

Commit 1bbe4f2

Browse files
authored
This patch enables the Firefly Station M2 board dts build and fixes hardware issues: (#434)
1. Fixes GMAC1 clock hierarchy and adds phy-supply for stable networking. 2. Corrects RGMII delays (tx=0x4f, rx=0x24) to fix packet loss/CRC errors. 3. Assigns VOP2 ESMART0 layer to the cursor to fix rendering issues. Signed-off-by: Gleb Shleikel <[email protected]>
1 parent 78db2e0 commit 1bbe4f2

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

arch/arm64/boot/dts/rockchip/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-tablet-rk806-single-v10.dtb
450450
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-tablet-v10.dtb
451451
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-tablet-v11.dtb
452452
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-luckfox-core3566.dtb
453+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-roc-pc.dtb
453454

454455
subdir-y := $(dts-dirs) overlay
455456

arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,8 +1542,9 @@
15421542
/* Reset time is 20ms, 100ms for rtl8211f */
15431543
snps,reset-delays-us = <0 20000 100000>;
15441544

1545-
assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1>;
1546-
assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>, <&gmac1_clkin>;
1545+
assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>;
1546+
assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>, <&gmac1_clkin>;
1547+
phy-supply = <&vcc_3v3>;
15471548

15481549
pinctrl-names = "default";
15491550
pinctrl-0 = <&gmac1m0_miim
@@ -1553,8 +1554,8 @@
15531554
&gmac1m0_rgmii_bus
15541555
&gmac1m0_clkinout>;
15551556

1556-
tx_delay = <0x4e>;
1557-
rx_delay = <0x2c>;
1557+
tx_delay = <0x4f>;
1558+
rx_delay = <0x24>;
15581559

15591560
phy-handle = <&rgmii_phy1>;
15601561
status = "okay";
@@ -1595,3 +1596,7 @@
15951596
status = "okay";
15961597
connect = <&vp0_out_hdmi>;
15971598
};
1599+
1600+
&vp0 {
1601+
cursor-win-id = <ROCKCHIP_VOP2_ESMART0>;
1602+
};

0 commit comments

Comments
 (0)