[PATCH 2/6] rockchip: dts: rk3328-evb: Move gmac2io related nodes to -u-boot.dtsi

Kever Yang
2020-03-27T06:38:57Z

On 2020/3/27 ??12:41, Chen-Yu Tsai wrote:
> From: Chen-Yu Tsai <wens@csie.org>
>
> 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.
>
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>

Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
> arch/arm/dts/rk3328-evb-u-boot.dtsi | 23 +++++++++++++++++++++++
> arch/arm/dts/rk3328-evb.dts | 23 -----------------------
> 2 files changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi
> index 5679897279aa..8ba53cf8f44b 100644
> --- a/arch/arm/dts/rk3328-evb-u-boot.dtsi
> +++ b/arch/arm/dts/rk3328-evb-u-boot.dtsi
> @@ -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;
> @@ -17,6 +24,22 @@
> };
> };
>
> +&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";
> diff --git a/arch/arm/dts/rk3328-evb.dts b/arch/arm/dts/rk3328-evb.dts
> index e9bc849f8c23..97bef37cf610 100644
> --- a/arch/arm/dts/rk3328-evb.dts
> +++ b/arch/arm/dts/rk3328-evb.dts
> @@ -14,13 +14,6 @@
> 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";
> @@ -78,22 +71,6 @@
> 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";
> };