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

[oweals/u-boot.git] / arch / arm / dts / r8a7795-salvator-x-u-boot.dts

diff --git a/arch/arm/dts/r8a7795-salvator-x-u-boot.dts b/arch/arm/dts/r8a7795-salvator-x-u-boot.dts
index a22028bb3184b662257411bd33d6df8cfed7ddc1..e93afe37d0c69d7e4441e171be4c0580c4c11386 100644 (file)
--- a/arch/arm/dts/r8a7795-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a7795-salvator-x-u-boot.dts
@@ -8,23 +8,6 @@
 #include "r8a7795-salvator-x.dts"
 #include "r8a7795-u-boot.dtsi"
 
-&vcc_sdhi0 {
-       u-boot,off-on-delay-us = <20000>;
-};
-
-&vcc_sdhi3 {
-       u-boot,off-on-delay-us = <20000>;
-};
-
-&sdhi2_pins {
-       groups = "sdhi2_data8", "sdhi2_ctrl", "sdhi2_ds";
-       power-source = <1800>;
-};
-
-&sdhi2_pins_uhs {
-       groups = "sdhi2_data8", "sdhi2_ctrl", "sdhi2_ds";
-};
-
 &sdhi0 {
        sd-uhs-sdr12;
        sd-uhs-sdr25;
@@ -43,3 +26,11 @@
        sd-uhs-sdr104;
        max-frequency = <208000000>;
 };
+
+&vcc_sdhi0 {
+       u-boot,off-on-delay-us = <20000>;
+};
+
+&vcc_sdhi3 {
+       u-boot,off-on-delay-us = <20000>;
+};