rockchip: dts: rk3328-evb: Move gmac2io related nodes to -u-boot.dtsi
authorChen-Yu Tsai <wens@csie.org>
Mon, 27 Apr 2020 06:52:47 +0000 (14:52 +0800)
committerKever Yang <kever.yang@rock-chips.com>
Fri, 1 May 2020 10:32:56 +0000 (18:32 +0800)
The device tree file for rk3328-evb in the Linux kernel does not have
gmac2io enabled. Instead, gmac2phy is enabled, but that is not supported
in U-boot.

Move the gmac2io related nodes to rk3328-evb-u-boot.dtsi to preserve the
current functionality. When the device tree files are synced, gmac2phy
should be marked as "broken" in -u-boot.dtsi files.

Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Tested-by: Loic Devulder <ldevulder@suse.com>
Tested-by: Peter Geis <pgwipeout@gmail.com>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
arch/arm/dts/rk3328-evb-u-boot.dtsi
arch/arm/dts/rk3328-evb.dts

index 5679897279aa56eb47cbcb661032355e63eb1d39..8ba53cf8f44b43c9748d608be978d4d074306947 100644 (file)
@@ -7,6 +7,13 @@
 #include "rk3328-sdram-ddr3-666.dtsi"
 
 /{
+       gmac_clkin: external-gmac-clock {
+               compatible = "fixed-clock";
+               clock-frequency = <125000000>;
+               clock-output-names = "gmac_clkin";
+               #clock-cells = <0>;
+       };
+
        vcc5v0_host_xhci: vcc5v0-host-xhci-drv {
                compatible = "regulator-fixed";
                enable-active-high;
        };
 };
 
+&gmac2io {
+       phy-supply = <&vcc_phy>;
+       phy-mode = "rgmii";
+       clock_in_out = "input";
+       snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
+       snps,reset-active-low;
+       snps,reset-delays-us = <0 10000 50000>;
+       assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
+       assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&rgmiim1_pins>;
+       tx_delay = <0x26>;
+       rx_delay = <0x11>;
+       status = "okay";
+};
+
 &usb_host0_xhci {
        vbus-supply = <&vcc5v0_host_xhci>;
        status = "okay";
index e9bc849f8c23bd803b6dce5c57083c9575346998..97bef37cf610407f23a20a9a88146aca52e0f5ae 100644 (file)
                stdout-path = &uart2;
        };
 
-       gmac_clkin: external-gmac-clock {
-               compatible = "fixed-clock";
-               clock-frequency = <125000000>;
-               clock-output-names = "gmac_clkin";
-               #clock-cells = <0>;
-       };
-
        vcc3v3_sdmmc: sdmmc-pwren {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3";
        status = "okay";
 };
 
-&gmac2io {
-       phy-supply = <&vcc_phy>;
-       phy-mode = "rgmii";
-       clock_in_out = "input";
-       snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
-       snps,reset-active-low;
-       snps,reset-delays-us = <0 10000 50000>;
-       assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
-       assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&rgmiim1_pins>;
-       tx_delay = <0x26>;
-       rx_delay = <0x11>;
-       status = "okay";
-};
-
 &usb_host0_ehci {
        status = "okay";
 };