Merge branch 'master' into next

[platform/kernel/u-boot.git] / arch / arm / dts / rk3188-radxarock-u-boot.dtsi

diff --git a/arch/arm/dts/rk3188-radxarock-u-boot.dtsi b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi
index de29959..7bcbc29 100644 (file)
--- a/arch/arm/dts/rk3188-radxarock-u-boot.dtsi
+++ b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi
@@ -13,12 +13,12 @@
 
        config {
                u-boot,boot-led = "rock:red:power";
-               u-boot,dm-pre-reloc;
+               bootph-all;
        };
 };
 
 &cru {
-       u-boot,dm-spl;
+       bootph-pre-ram;
 };
 
 &dmc {
@@ -48,14 +48,14 @@
 };
 
 &pinctrl {
-       u-boot,dm-spl;
+       bootph-pre-ram;
 };
 
 &timer3 {
        clock-frequency = <24000000>;
-       u-boot,dm-spl;
+       bootph-pre-ram;
 };
 
 &uart2 {
-       u-boot,dm-spl;
+       bootph-pre-ram;
 };