Merge tag 'u-boot-imx-20191009' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / arch / arm / dts / rk3399-evb.dts

diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts
index 0e5d8d79a19fa53d4c9c3d3d5a086528332d1a4b..a506e8da370232aab5486d2acd0ec9ee3e8f7450 100644 (file)
--- a/arch/arm/dts/rk3399-evb.dts
+++ b/arch/arm/dts/rk3399-evb.dts
@@ -1,14 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 /dts-v1/;
 #include <dt-bindings/pwm/pwm.h>
 #include <dt-bindings/pinctrl/rockchip.h>
 #include "rk3399.dtsi"
-#include "rk3399-sdram-lpddr3-4GB-1600.dtsi"
 
 / {
        model = "Rockchip RK3399 Evaluation Board";
@@ -17,6 +15,8 @@
 
        chosen {
                stdout-path = &uart2;
+               u-boot,spl-boot-order = \
+                       &sdhci, &sdmmc;
        };
 
        vdd_center: vdd-center {
@@ -276,7 +276,7 @@
        assigned-clock-parents = <&clkin_gmac>;
        pinctrl-names = "default";
        pinctrl-0 = <&rgmii_pins>;
-       tx_delay = <0x10>;
-       rx_delay = <0x10>;
+       tx_delay = <0x28>;
+       rx_delay = <0x11>;
        status = "okay";
 };