Merge branch 'master' into next

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

diff --git a/arch/arm/dts/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi
index ecf88e0..0a764ce 100644 (file)
--- a/arch/arm/dts/rk356x-u-boot.dtsi
+++ b/arch/arm/dts/rk356x-u-boot.dtsi
@@ -12,7 +12,7 @@
        };
 
        chosen {
-               u-boot,spl-boot-order = &sdhci, &sdmmc0;
+               u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc0;
        };
 
        dmc: dmc {
@@ -34,11 +34,6 @@
        };
 };
 
-&combphy1 {
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-rates;
-};
-
 &cru {
        bootph-all;
        status = "okay";