Merge branch 'master' of git://git.denx.de/u-boot-sh

- ARM: dts: rmobile: Restore increase off-on delay on the SD Vcc regulator

diff --git a/arch/arm/dts/r8a7795-h3ulcb-u-boot.dts b/arch/arm/dts/r8a7795-h3ulcb-u-boot.dts
index dda339b..ef1c57f 100644 (file)
--- a/arch/arm/dts/r8a7795-h3ulcb-u-boot.dts
+++ b/arch/arm/dts/r8a7795-h3ulcb-u-boot.dts
@@ -30,3 +30,7 @@
        mmc-hs400-1_8v;
        max-frequency = <200000000>;
 };
+
+&vcc_sdhi0 {
+       u-boot,off-on-delay-us = <20000>;
+};

diff --git a/arch/arm/dts/r8a7795-salvator-x-u-boot.dts b/arch/arm/dts/r8a7795-salvator-x-u-boot.dts
index 66b608a..e93afe3 100644 (file)
--- a/arch/arm/dts/r8a7795-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a7795-salvator-x-u-boot.dts
@@ -26,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>;
+};

diff --git a/arch/arm/dts/r8a7796-m3ulcb-u-boot.dts b/arch/arm/dts/r8a7796-m3ulcb-u-boot.dts
index 1defe84..314eacc 100644 (file)
--- a/arch/arm/dts/r8a7796-m3ulcb-u-boot.dts
+++ b/arch/arm/dts/r8a7796-m3ulcb-u-boot.dts
@@ -30,3 +30,7 @@
        mmc-hs400-1_8v;
        max-frequency = <200000000>;
 };
+
+&vcc_sdhi0 {
+       u-boot,off-on-delay-us = <20000>;
+};

diff --git a/arch/arm/dts/r8a7796-salvator-x-u-boot.dts b/arch/arm/dts/r8a7796-salvator-x-u-boot.dts
index 2610f8b..2a7b149 100644 (file)
--- a/arch/arm/dts/r8a7796-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a7796-salvator-x-u-boot.dts
@@ -26,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>;
+};

diff --git a/arch/arm/dts/r8a77965-m3nulcb-u-boot.dts b/arch/arm/dts/r8a77965-m3nulcb-u-boot.dts
index 8ecfc7a..cf10431 100644 (file)
--- a/arch/arm/dts/r8a77965-m3nulcb-u-boot.dts
+++ b/arch/arm/dts/r8a77965-m3nulcb-u-boot.dts
@@ -32,3 +32,7 @@
        max-frequency = <200000000>;
        status = "okay";
 };
+
+&vcc_sdhi0 {
+       u-boot,off-on-delay-us = <20000>;
+};

diff --git a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts b/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
index 208ed56..e4bd2d3 100644 (file)
--- a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
@@ -29,3 +29,11 @@
        max-frequency = <208000000>;
        status = "okay";
 };
+
+&vcc_sdhi0 {
+       u-boot,off-on-delay-us = <20000>;
+};
+
+&vcc_sdhi3 {
+       u-boot,off-on-delay-us = <20000>;
+};

diff --git a/arch/arm/dts/r8a77990-ebisu-u-boot.dts b/arch/arm/dts/r8a77990-ebisu-u-boot.dts
index 1ce22e5..0ea0cc9 100644 (file)
--- a/arch/arm/dts/r8a77990-ebisu-u-boot.dts
+++ b/arch/arm/dts/r8a77990-ebisu-u-boot.dts
@@ -29,3 +29,11 @@
        sd-uhs-sdr25;
        max-frequency = <208000000>;
 };
+
+&vcc_sdhi0 {
+       u-boot,off-on-delay-us = <20000>;
+};
+
+&vcc_sdhi1 {
+       u-boot,off-on-delay-us = <20000>;
+};