Merge tag 'u-boot-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / arch / arm / dts / rk3328-evb-u-boot.dtsi

diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi
index 58ebf52..4bfa0c2 100644 (file)
--- a/arch/arm/dts/rk3328-evb-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-evb-u-boot.dtsi
@@ -1,33 +1,51 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * (C) Copyright 2016 Rockchip Electronics Co., Ltd
+ * (C) Copyright 2016-2019 Rockchip Electronics Co., Ltd
  */
 
+#include "rk3328-u-boot.dtsi"
 #include "rk3328-sdram-ddr3-666.dtsi"
 
-/ {
-       aliases {
-               mmc0 = &emmc;
-               mmc1 = &sdmmc;
+/{
+       gmac_clkin: external-gmac-clock {
+               compatible = "fixed-clock";
+               clock-frequency = <125000000>;
+               clock-output-names = "gmac_clkin";
+               #clock-cells = <0>;
        };
 
-       chosen {
-               u-boot,spl-boot-order = &emmc, &sdmmc;
+       vcc5v0_host_xhci: vcc5v0-host-xhci-drv {
+               compatible = "regulator-fixed";
+               enable-active-high;
+               gpio = <&gpio0 0 GPIO_ACTIVE_HIGH>;
+               regulator-name = "vcc5v0_host_xhci";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
        };
 };
 
-&cru {
-       u-boot,dm-pre-reloc;
+&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";
 };
 
-&uart2 {
-       u-boot,dm-pre-reloc;
+&gmac2phy {
+       /* Integrated PHY unsupported by U-boot */
+       status = "broken";
 };
 
-&emmc {
-       u-boot,dm-pre-reloc;
-};
-
-&sdmmc {
-       u-boot,dm-pre-reloc;
+&usb_host0_xhci {
+       vbus-supply = <&vcc5v0_host_xhci>;
+       status = "okay";
 };