summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-10-05 20:06:58 -0400
committerTom Rini <trini@konsulko.com>2019-10-05 20:06:58 -0400
commitdac51e9aaf6fd38298007b266feb6a80e9ec91ee (patch)
tree6cdc8c28464fbb76db7abe162dd886a14543086b
parent62861c70d3128680823fa091dcc2f6fee3bca30c (diff)
parent49d5fba81c85c65f8b64f79ceece48b590e8316d (diff)
downloadu-boot-dac51e9aaf6fd38298007b266feb6a80e9ec91ee.tar.gz
u-boot-dac51e9aaf6fd38298007b266feb6a80e9ec91ee.tar.bz2
u-boot-dac51e9aaf6fd38298007b266feb6a80e9ec91ee.zip
Merge branch 'master' of git://git.denx.de/u-boot-sh
- ARM: dts: rmobile: Restore increase off-on delay on the SD Vcc regulator
-rw-r--r--arch/arm/dts/r8a7795-h3ulcb-u-boot.dts4
-rw-r--r--arch/arm/dts/r8a7795-salvator-x-u-boot.dts8
-rw-r--r--arch/arm/dts/r8a7796-m3ulcb-u-boot.dts4
-rw-r--r--arch/arm/dts/r8a7796-salvator-x-u-boot.dts8
-rw-r--r--arch/arm/dts/r8a77965-m3nulcb-u-boot.dts4
-rw-r--r--arch/arm/dts/r8a77965-salvator-x-u-boot.dts8
-rw-r--r--arch/arm/dts/r8a77990-ebisu-u-boot.dts8
7 files changed, 44 insertions, 0 deletions
diff --git a/arch/arm/dts/r8a7795-h3ulcb-u-boot.dts b/arch/arm/dts/r8a7795-h3ulcb-u-boot.dts
index dda339bd30..ef1c57f672 100644
--- 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 66b608a0f1..e93afe37d0 100644
--- 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 1defe84f98..314eacc2bc 100644
--- 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 2610f8baa8..2a7b149894 100644
--- 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 8ecfc7a3aa..cf10431269 100644
--- 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 208ed56bd1..e4bd2d3e4f 100644
--- 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 1ce22e5c0f..0ea0cc9cb1 100644
--- 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>;
+};