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

[oweals/u-boot.git] / arch / arm / dts / exynos5422-odroidxu3.dts

diff --git a/arch/arm/dts/exynos5422-odroidxu3.dts b/arch/arm/dts/exynos5422-odroidxu3.dts
index b48ca3b1212656ad4973e4184dd2042f24682a47..6df6be91814f080b38cac2a251952e6a468f9013 100644 (file)
--- a/arch/arm/dts/exynos5422-odroidxu3.dts
+++ b/arch/arm/dts/exynos5422-odroidxu3.dts
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Odroid XU3 device tree source
  *
  * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /dts-v1/;
@@ -33,6 +32,7 @@
 
        adc@12D10000 {
                u-boot,dm-pre-reloc;
+               vdd-supply = <&ldo4_reg>;
                status = "okay";
        };
 
@@ -45,6 +45,7 @@
                                        regulator-name = "vdd_ldo1";
                                        regulator-min-microvolt = <1000000>;
                                        regulator-max-microvolt = <1000000>;
+                                       regulator-ramp-delay = <12000>;
                                        regulator-always-on;
                                };
 
@@ -52,18 +53,21 @@
                                        regulator-name = "vddq_mmc0";
                                        regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
+                                       regulator-ramp-delay = <12000>;
                                };
 
                                ldo4_reg: LDO4 {
                                        regulator-name = "vdd_adc";
                                        regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
+                                       regulator-ramp-delay = <12000>;
                                };
 
                                ldo5_reg: LDO5 {
                                        regulator-name = "vdd_ldo5";
                                        regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
+                                       regulator-ramp-delay = <12000>;
                                        regulator-always-on;
                                };
 
@@ -71,6 +75,7 @@
                                        regulator-name = "vdd_ldo6";
                                        regulator-min-microvolt = <1000000>;
                                        regulator-max-microvolt = <1000000>;
+                                       regulator-ramp-delay = <12000>;
                                        regulator-always-on;
                                };
 
@@ -78,6 +83,7 @@
                                        regulator-name = "vdd_ldo7";
                                        regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
+                                       regulator-ramp-delay = <12000>;
                                        regulator-always-on;
                                };
 
@@ -85,6 +91,7 @@
                                        regulator-name = "vdd_ldo8";
                                        regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
+                                       regulator-ramp-delay = <12000>;
                                        regulator-always-on;
                                };
 
@@ -92,6 +99,7 @@
                                        regulator-name = "vdd_ldo9";
                                        regulator-min-microvolt = <3000000>;
                                        regulator-max-microvolt = <3000000>;
+                                       regulator-ramp-delay = <12000>;
                                        regulator-always-on;
                                };
 
@@ -99,6 +107,7 @@
                                        regulator-name = "vdd_ldo10";
                                        regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
+                                       regulator-ramp-delay = <12000>;
                                        regulator-always-on;
                                };
 
@@ -106,6 +115,7 @@
                                        regulator-name = "vdd_ldo11";
                                        regulator-min-microvolt = <1000000>;
                                        regulator-max-microvolt = <1000000>;
+                                       regulator-ramp-delay = <12000>;
                                        regulator-always-on;
                                };
 
@@ -113,6 +123,7 @@
                                        regulator-name = "vdd_ldo12";
                                        regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
+                                       regulator-ramp-delay = <12000>;
                                        regulator-always-on;
                                };
 
@@ -120,12 +131,14 @@
                                        regulator-name = "vddq_mmc2";
                                        regulator-min-microvolt = <2800000>;
                                        regulator-max-microvolt = <2800000>;
+                                       regulator-ramp-delay = <12000>;
                                };
 
                                ldo15_reg: LDO15 {
                                        regulator-name = "vdd_ldo15";
                                        regulator-min-microvolt = <3300000>;
                                        regulator-max-microvolt = <3300000>;
+                                       regulator-ramp-delay = <12000>;
                                        regulator-always-on;
                                };
 
@@ -133,6 +146,7 @@
                                        regulator-name = "vdd_ldo16";
                                        regulator-min-microvolt = <2200000>;
                                        regulator-max-microvolt = <2200000>;
+                                       regulator-ramp-delay = <12000>;
                                        regulator-always-on;
                                };
 
@@ -140,6 +154,7 @@
                                        regulator-name = "vdd_ldo17";
                                        regulator-min-microvolt = <3300000>;
                                        regulator-max-microvolt = <3300000>;
+                                       regulator-ramp-delay = <12000>;
                                        regulator-always-on;
                                };
 
@@ -147,18 +162,21 @@
                                        regulator-name = "vdd_emmc_1V8";
                                        regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
+                                       regulator-ramp-delay = <12000>;
                                };
 
                                ldo19_reg: LDO19 {
                                        regulator-name = "vdd_sd";
                                        regulator-min-microvolt = <2800000>;
                                        regulator-max-microvolt = <2800000>;
+                                       regulator-ramp-delay = <12000>;
                                };
 
                                ldo24_reg: LDO24 {
                                        regulator-name = "tsp_io";
                                        regulator-min-microvolt = <2800000>;
                                        regulator-max-microvolt = <2800000>;
+                                       regulator-ramp-delay = <12000>;
                                        regulator-always-on;
                                };
 
@@ -166,6 +184,7 @@
                                        regulator-name = "vdd_ldo26";
                                        regulator-min-microvolt = <3000000>;
                                        regulator-max-microvolt = <3000000>;
+                                       regulator-ramp-delay = <12000>;
                                        regulator-always-on;
                                };
 
@@ -257,7 +276,7 @@
        };
 
        serial@12C20000 {
-               status="okay";
+               status = "okay";
        };
 
        mmc@12200000 {