diff --git a/rk356x/.dr4-rk3568.dtb.dts.tmp b/rk356x/.dr4-rk3568.dtb.dts.tmp index a582889..6c659b6 100644 --- a/rk356x/.dr4-rk3568.dtb.dts.tmp +++ b/rk356x/.dr4-rk3568.dtb.dts.tmp @@ -8858,40 +8858,37 @@ dsi1_panel: panel@0 { vpcie3v3-supply = <&vcc3v3_sys>; status = "okay"; memory-region = <&pcie_dma>; - - - }; # 16 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 # 28 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" # 1 "arch/arm64/boot/dts/rockchip/rk356x/rp-gmac0-pro-rk3568.dtsi" 1 &gmac0 { - phy-mode = "rgmii"; - clock_in_out = "input"; + phy-mode = "rgmii"; + clock_in_out = "input"; + snps,reset-gpio = <&gpio2 21 1>; + snps,reset-active-low; - snps,reset-gpio = <&gpio2 21 1>; - snps,reset-active-low; + snps,reset-delays-us = <0 20000 100000>; - snps,reset-delays-us = <0 20000 100000>; + assigned-clocks = <&cru 389>, <&cru 386>; + assigned-clock-parents = <&cru 387>, <&gmac0_clkin>; + assigned-clock-rates = <0>, <125000000>; - assigned-clocks = <&cru 389>, <&cru 386>, <&cru 183>; - assigned-clock-parents = <&cru 387>, <&gmac0_clkin>, <&cru 182>; - assigned-clock-rates = <0>, <125000000>, <25000000>; + pinctrl-names = "default"; + pinctrl-0 = <&gmac0_miim + &gmac0_tx_bus2 + &gmac0_rx_bus2 + &gmac0_rgmii_clk_level2 + &gmac0_rgmii_bus + &gmac0_clkinout>; - pinctrl-names = "default"; - pinctrl-0 = <&gmac0_miim - &gmac0_tx_bus2 - &gmac0_rx_bus2 - &gmac0_rgmii_clk - &gmac0_rgmii_bus - ð0_pins - &gmac0_clkinout>; - tx_delay = <0x2d>; - rx_delay = <0x2c>; - phy-handle = <&rgmii_phy0>; - status = "okay"; + tx_delay = <0x3c>; + rx_delay = <0x2f>; + + phy-handle = <&rgmii_phy0>; + status = "okay"; }; @@ -8899,7 +8896,6 @@ dsi1_panel: panel@0 { rgmii_phy0: phy@0 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <0x0>; - clocks = <&cru 183>; }; }; # 29 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 diff --git a/rk356x/dr4-rk3568.dtb b/rk356x/dr4-rk3568.dtb index 4c47594..0ae4d4c 100644 Binary files a/rk356x/dr4-rk3568.dtb and b/rk356x/dr4-rk3568.dtb differ diff --git a/rk356x/rp-gmac0-pro-rk3568.dtsi b/rk356x/rp-gmac0-pro-rk3568.dtsi index 48864b8..2cc1990 100755 --- a/rk356x/rp-gmac0-pro-rk3568.dtsi +++ b/rk356x/rp-gmac0-pro-rk3568.dtsi @@ -2,25 +2,29 @@ &gmac0 { phy-mode = "rgmii"; clock_in_out = "input"; + snps,reset-gpio = <&gpio2 RK_PC5 GPIO_ACTIVE_LOW>; + snps,reset-active-low; + /* Reset time is 20ms, 100ms for rtl8211f */ + snps,reset-delays-us = <0 20000 100000>; + assigned-clocks = <&cru SCLK_GMAC0_RX_TX>, <&cru SCLK_GMAC0>; assigned-clock-parents = <&cru SCLK_GMAC0_RGMII_SPEED>, <&gmac0_clkin>; assigned-clock-rates = <0>, <125000000>; - snps,reset-gpio = <&gpio2 RK_PC5 GPIO_ACTIVE_LOW>; - snps,reset-active-high; - /* Reset time is 20ms, 100ms for rtl8211f */ - snps,reset-delays-us = <0 20000 100000>; + pinctrl-names = "default"; pinctrl-0 = <&gmac0_miim - &gmac0_tx_bus2 - &gmac0_rx_bus2 - &gmac0_rgmii_clk - &gmac0_rgmii_bus - &gmac0_clkinout>; + &gmac0_tx_bus2 + &gmac0_rx_bus2 + &gmac0_rgmii_clk_level2 + &gmac0_rgmii_bus + &gmac0_clkinout>; - tx_delay = <0x3c>; - rx_delay = <0x2f>; - phy-handle = <&rgmii_phy0>; - status = "okay"; + + tx_delay = <0x3c>; + rx_delay = <0x2f>; + + phy-handle = <&rgmii_phy0>; + status = "okay"; };