MLK-22853 DTS: imx: fix the regulator off-on-delay property

The property was changed to "u-boot,off-on-delay-us" in u-boot fixed
regulator. Update the dts to use the new name

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit e68d12af8d17ae1017eacfc73b72ab999ef9837f)

diff --git a/arch/arm/dts/fsl-imx8mm-ddr4-val.dts b/arch/arm/dts/fsl-imx8mm-ddr4-val.dts
index e45b46f..ffc4bd6 100644 (file)
--- a/arch/arm/dts/fsl-imx8mm-ddr4-val.dts
+++ b/arch/arm/dts/fsl-imx8mm-ddr4-val.dts
@@ -25,7 +25,7 @@
                gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>;
                enable-active-high;
                startup-delay-us = <100>;
-               off-on-delay-us = <12000>;
+               u-boot,off-on-delay-us = <12000>;
        };
 };
 

diff --git a/arch/arm/dts/fsl-imx8mm-evk.dts b/arch/arm/dts/fsl-imx8mm-evk.dts
index 3c6fe1f..0d492c7 100644 (file)
--- a/arch/arm/dts/fsl-imx8mm-evk.dts
+++ b/arch/arm/dts/fsl-imx8mm-evk.dts
@@ -40,7 +40,7 @@
                gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>;
                enable-active-high;
                startup-delay-us = <100>;
-               off-on-delay-us = <12000>;
+               u-boot,off-on-delay-us = <12000>;
        };
 };
 

diff --git a/arch/arm/dts/fsl-imx8mn-ddr4-evk.dts b/arch/arm/dts/fsl-imx8mn-ddr4-evk.dts
index b2b560d..1937bfb 100644 (file)
--- a/arch/arm/dts/fsl-imx8mn-ddr4-evk.dts
+++ b/arch/arm/dts/fsl-imx8mn-ddr4-evk.dts
@@ -40,7 +40,7 @@
                gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>;
                enable-active-high;
                startup-delay-us = <100>;
-               off-on-delay-us = <12000>;
+               u-boot,off-on-delay-us = <12000>;
        };
 };
 

diff --git a/arch/arm/dts/imx6qdl-sabreauto.dtsi b/arch/arm/dts/imx6qdl-sabreauto.dtsi
index 844c6ac..ac4741d 100644 (file)
--- a/arch/arm/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/dts/imx6qdl-sabreauto.dtsi
@@ -168,7 +168,7 @@
                        regulator-max-microvolt = <3300000>;
                        gpio = <&gpio7 8 GPIO_ACTIVE_HIGH>;
                        enable-active-high;
-                       off-on-delay = <20000>;
+                       u-boot,off-on-delay-us = <20000>;
                        /* remove below line to enable this regulator */
                        status = "disabled";
                };

diff --git a/arch/arm/dts/imx6sll-evk.dts b/arch/arm/dts/imx6sll-evk.dts
index dd48b73..c92a9cf 100644 (file)
--- a/arch/arm/dts/imx6sll-evk.dts
+++ b/arch/arm/dts/imx6sll-evk.dts
@@ -108,7 +108,7 @@
                        regulator-min-microvolt = <3000000>;
                        regulator-max-microvolt = <3000000>;
                        gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>;
-                       off-on-delay = <20000>;
+                       u-boot,off-on-delay-us = <20000>;
                        enable-active-high;
                };
 
@@ -126,7 +126,7 @@
                        regulator-min-microvolt = <3000000>;
                        regulator-max-microvolt = <3000000>;
                        gpio = <&gpio4 4 GPIO_ACTIVE_HIGH>;
-                       off-on-delay = <20000>;
+                       u-boot,off-on-delay-us = <20000>;
                        enable-active-high;
                };
 

diff --git a/arch/arm/dts/imx6sll-lpddr3-arm2.dts b/arch/arm/dts/imx6sll-lpddr3-arm2.dts
index 92079a5..5b43730 100644 (file)
--- a/arch/arm/dts/imx6sll-lpddr3-arm2.dts
+++ b/arch/arm/dts/imx6sll-lpddr3-arm2.dts
@@ -104,7 +104,7 @@
                        regulator-min-microvolt = <3000000>;
                        regulator-max-microvolt = <3000000>;
                        gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>;
-                       off-on-delay = <20000>;
+                       u-boot,off-on-delay-us = <20000>;
                        enable-active-high;
                };
 
@@ -122,7 +122,7 @@
                        regulator-min-microvolt = <3000000>;
                        regulator-max-microvolt = <3000000>;
                        gpio = <&gpio4 4 GPIO_ACTIVE_HIGH>;
-                       off-on-delay = <20000>;
+                       u-boot,off-on-delay-us = <20000>;
                        enable-active-high;
                };
 

diff --git a/arch/arm/dts/imx6sx-14x14-arm2.dts b/arch/arm/dts/imx6sx-14x14-arm2.dts
index 12980c4..5946e6b 100644 (file)
--- a/arch/arm/dts/imx6sx-14x14-arm2.dts
+++ b/arch/arm/dts/imx6sx-14x14-arm2.dts
@@ -58,7 +58,7 @@
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        gpio = <&gpio2 11 GPIO_ACTIVE_LOW>;
-                       off-on-delay = <20000>;
+                       u-boot,off-on-delay-us = <20000>;
                };
 
                reg_usb_otg1_vbus: usb_otg1_vbus {

diff --git a/arch/arm/dts/imx6sx-sdb.dtsi b/arch/arm/dts/imx6sx-sdb.dtsi
index f9ce136..7c0839c 100644 (file)
--- a/arch/arm/dts/imx6sx-sdb.dtsi
+++ b/arch/arm/dts/imx6sx-sdb.dtsi
@@ -83,7 +83,7 @@
                        regulator-min-microvolt = <3000000>;
                        regulator-max-microvolt = <3000000>;
                        gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>;
-                       off-on-delay = <20000>;
+                       u-boot,off-on-delay-us = <20000>;
                        enable-active-high;
                };
 

diff --git a/arch/arm/dts/imx6ul-14x14-ddr3-arm2.dts b/arch/arm/dts/imx6ul-14x14-ddr3-arm2.dts
index 30cdff4..059854b 100644 (file)
--- a/arch/arm/dts/imx6ul-14x14-ddr3-arm2.dts
+++ b/arch/arm/dts/imx6ul-14x14-ddr3-arm2.dts
@@ -52,7 +52,7 @@
                        regulator-min-microvolt = <3000000>;
                        regulator-max-microvolt = <3000000>;
                        gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-                       off-on-delay = <20000>;
+                       u-boot,off-on-delay-us = <20000>;
                        enable-active-high;
                };
 
@@ -62,7 +62,7 @@
                        regulator-min-microvolt = <3000000>;
                        regulator-max-microvolt = <3000000>;
                        gpio = <&gpio4 10 GPIO_ACTIVE_HIGH>;
-                       off-on-delay = <20000>;
+                       u-boot,off-on-delay-us = <20000>;
                        enable-active-high;
                };
 

diff --git a/arch/arm/dts/imx6ul-14x14-evk.dts b/arch/arm/dts/imx6ul-14x14-evk.dts
index 8e72d17..6c6c967 100644 (file)
--- a/arch/arm/dts/imx6ul-14x14-evk.dts
+++ b/arch/arm/dts/imx6ul-14x14-evk.dts
@@ -61,7 +61,7 @@
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-                       off-on-delay = <20000>;
+                       u-boot,off-on-delay-us = <20000>;
                        enable-active-high;
                };
 

diff --git a/arch/arm/dts/imx6ul-14x14-lpddr2-arm2.dts b/arch/arm/dts/imx6ul-14x14-lpddr2-arm2.dts
index f79ed46..5eaf810 100644 (file)
--- a/arch/arm/dts/imx6ul-14x14-lpddr2-arm2.dts
+++ b/arch/arm/dts/imx6ul-14x14-lpddr2-arm2.dts
@@ -52,7 +52,7 @@
                        regulator-min-microvolt = <3000000>;
                        regulator-max-microvolt = <3000000>;
                        gpio = <&gpio4 11 GPIO_ACTIVE_HIGH>;
-                       off-on-delay = <20000>;
+                       u-boot,off-on-delay-us = <20000>;
                        enable-active-high;
                };
 

diff --git a/arch/arm/dts/imx6ul-9x9-evk.dts b/arch/arm/dts/imx6ul-9x9-evk.dts
index 4696c5f..3b7d24c 100644 (file)
--- a/arch/arm/dts/imx6ul-9x9-evk.dts
+++ b/arch/arm/dts/imx6ul-9x9-evk.dts
@@ -83,7 +83,7 @@
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-                       off-on-delay = <20000>;
+                       u-boot,off-on-delay-us = <20000>;
                        enable-active-high;
                };
        };

diff --git a/arch/arm/dts/imx6ull-14x14-ddr3-arm2.dts b/arch/arm/dts/imx6ull-14x14-ddr3-arm2.dts
index 4f5e363..8f2c7b2 100644 (file)
--- a/arch/arm/dts/imx6ull-14x14-ddr3-arm2.dts
+++ b/arch/arm/dts/imx6ull-14x14-ddr3-arm2.dts
@@ -47,7 +47,7 @@
                        regulator-min-microvolt = <3000000>;
                        regulator-max-microvolt = <3000000>;
                        gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-                       off-on-delay = <20000>;
+                       u-boot,off-on-delay-us = <20000>;
                        enable-active-high;
                };
 

diff --git a/arch/arm/dts/imx6ull-14x14-evk.dts b/arch/arm/dts/imx6ull-14x14-evk.dts
index 9a9f921..844f0e8 100644 (file)
--- a/arch/arm/dts/imx6ull-14x14-evk.dts
+++ b/arch/arm/dts/imx6ull-14x14-evk.dts
@@ -72,7 +72,7 @@
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-                       off-on-delay = <20000>;
+                       u-boot,off-on-delay-us = <20000>;
                        enable-active-high;
                };
 

diff --git a/arch/arm/dts/imx6ull-9x9-evk.dts b/arch/arm/dts/imx6ull-9x9-evk.dts
index 9c7aadb..7762e11 100644 (file)
--- a/arch/arm/dts/imx6ull-9x9-evk.dts
+++ b/arch/arm/dts/imx6ull-9x9-evk.dts
@@ -85,7 +85,7 @@
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-                       off-on-delay = <20000>;
+                       u-boot,off-on-delay-us = <20000>;
                        enable-active-high;
                };
        };

diff --git a/arch/arm/dts/imx7d-sdb.dts b/arch/arm/dts/imx7d-sdb.dts
index e883baa..9480ef0 100644 (file)
--- a/arch/arm/dts/imx7d-sdb.dts
+++ b/arch/arm/dts/imx7d-sdb.dts
@@ -94,7 +94,7 @@
                regulator-max-microvolt = <3300000>;
                gpio = <&gpio5 2 GPIO_ACTIVE_HIGH>;
                startup-delay-us = <200000>;
-               off-on-delay = <20000>;
+               u-boot,off-on-delay-us = <20000>;
                enable-active-high;
        };