Merge git://git.denx.de/u-boot-video

[oweals/u-boot.git] / arch / arm / dts / rk3368-lion-u-boot.dtsi

diff --git a/arch/arm/dts/rk3368-lion-u-boot.dtsi b/arch/arm/dts/rk3368-lion-u-boot.dtsi
index 6052e8a8d38926ed2ccf92a3b04c5e1792134a87..a9b7f81c6273019260b352e8de04246b931cbcef 100644 (file)
--- a/arch/arm/dts/rk3368-lion-u-boot.dtsi
+++ b/arch/arm/dts/rk3368-lion-u-boot.dtsi
@@ -13,6 +13,7 @@
        chosen {
                stdout-path = "serial0:115200n8";
                u-boot,spl-boot-order = &emmc, &sdmmc;
+               tick-timer = "/timer@ff810000";
        };
 
 };
@@ -70,24 +71,25 @@
 };
 
 &emmc {
-       u-boot,dm-pre-reloc;
+       u-boot,dm-spl;
 };
 
 &sdmmc {
-       u-boot,dm-pre-reloc;
+       u-boot,dm-spl;
 };
 
 &spi1 {
-       u-boot,dm-pre-reloc;
+       u-boot,dm-spl;
 
        spiflash: w25q32dw@0 {
-               u-boot,dm-pre-reloc;
+               u-boot,dm-spl;
        };
 };
 
 &timer0 {
        u-boot,dm-pre-reloc;
        clock-frequency = <24000000>;
+       status = "okay";
 };