diff options
author | Haibo Chen <haibo.chen@nxp.com> | 2019-11-05 16:13:38 +0800 |
---|---|---|
committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-11-25 16:09:11 +0800 |
commit | 288239489365b4c6485847edce76eadfbf1ef84d (patch) | |
tree | 4efde674ac2fb078667993c8334ad8286823b7c0 | |
parent | 7a34d0e8b2f6a6dcf6c8461d06604058594f2a47 (diff) |
MLK-22900 ARM: dts: change to use off-on-delay-us in regulator
After commit f7907e57aea2 ("regulator: fixed: add off-on-delay"), user
can use "off-on-delay-us" to define the regulator off-delay time.
For SD card, according to the spec requirement, for sd card power reset
operation, it need sd card supply voltage to be lower than 0.5v and keep
over 1ms, otherwise, next time power back the sd card supply voltage to
3.3v, sd card can't support SD3.0 mode again.
This patch add the off-on-delay-us to each board, make sure the sd power
reset behavior is align with the specification. Without this patch, when
do quick system suspend/resume test, some sd card can't work at SD3.0 mode
after system resume back.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Acked-by: Leonard Crestez <leonard.crestez@nxp.com>
-rw-r--r-- | arch/arm/boot/dts/imx6sll-evk.dts | 3 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6sx-sdb.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ul-9x9-evk.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ull-9x9-evk.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx7d-sdb.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx7ulp-evk.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx7ulp-evkb-sd1.dts | 1 | ||||
-rwxr-xr-x | arch/arm64/boot/dts/freescale/imx8dxl-phantom-mek.dtsi | 2 | ||||
-rwxr-xr-x | arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 3 | ||||
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 1 | ||||
-rwxr-xr-x | arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 1 | ||||
-rwxr-xr-x | arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 1 | ||||
-rwxr-xr-x | arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 1 |
14 files changed, 17 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/imx6sll-evk.dts b/arch/arm/boot/dts/imx6sll-evk.dts index 340ec1702d83..8773ab34b1fa 100644 --- a/arch/arm/boot/dts/imx6sll-evk.dts +++ b/arch/arm/boot/dts/imx6sll-evk.dts @@ -111,6 +111,7 @@ regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>; + off-on-delay-us = <20000>; enable-active-high; }; @@ -130,7 +131,7 @@ regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; gpio = <&gpio4 4 GPIO_ACTIVE_HIGH>; - off-on-delay = <20000>; + off-on-delay-us = <20000>; enable-active-high; }; diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi index 1d25ded62972..fbe594f0e7fa 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dtsi +++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi @@ -56,6 +56,7 @@ regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>; + off-on-delay-us = <20000>; enable-active-high; }; diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi index 94b511b63518..abb8cae23622 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi @@ -31,6 +31,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>; + off-on-delay-us = <20000>; enable-active-high; }; diff --git a/arch/arm/boot/dts/imx6ul-9x9-evk.dts b/arch/arm/boot/dts/imx6ul-9x9-evk.dts index e6d978dc1b65..dc4e38dd8ab2 100644 --- a/arch/arm/boot/dts/imx6ul-9x9-evk.dts +++ b/arch/arm/boot/dts/imx6ul-9x9-evk.dts @@ -82,7 +82,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>; - off-on-delay = <20000>; + off-on-delay-us = <20000>; enable-active-high; }; }; diff --git a/arch/arm/boot/dts/imx6ull-9x9-evk.dts b/arch/arm/boot/dts/imx6ull-9x9-evk.dts index 14114e396ea3..d645f81eff7e 100644 --- a/arch/arm/boot/dts/imx6ull-9x9-evk.dts +++ b/arch/arm/boot/dts/imx6ull-9x9-evk.dts @@ -82,7 +82,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>; - off-on-delay = <20000>; + off-on-delay-us = <20000>; enable-active-high; }; }; diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index 12e31073e4aa..f9aeecda0656 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -102,6 +102,7 @@ regulator-max-microvolt = <3300000>; gpio = <&gpio5 2 GPIO_ACTIVE_HIGH>; startup-delay-us = <200000>; + off-on-delay-us = <20000>; enable-active-high; }; diff --git a/arch/arm/boot/dts/imx7ulp-evk.dts b/arch/arm/boot/dts/imx7ulp-evk.dts index 907a7fc552e3..257c47fdd524 100644 --- a/arch/arm/boot/dts/imx7ulp-evk.dts +++ b/arch/arm/boot/dts/imx7ulp-evk.dts @@ -142,6 +142,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc0_rst>; gpio = <&gpio_ptd 0 GPIO_ACTIVE_HIGH>; + off-on-delay-us = <20000>; enable-active-high; }; @@ -152,6 +153,7 @@ regulator-max-microvolt = <3300000>; gpio = <&rpmsg_gpio0 14 GPIO_ACTIVE_HIGH>; startup-delay-us = <100>; + off-on-delay-us = <20000>; enable-active-high; }; }; diff --git a/arch/arm/boot/dts/imx7ulp-evkb-sd1.dts b/arch/arm/boot/dts/imx7ulp-evkb-sd1.dts index 270027476336..8984a6ace291 100644 --- a/arch/arm/boot/dts/imx7ulp-evkb-sd1.dts +++ b/arch/arm/boot/dts/imx7ulp-evkb-sd1.dts @@ -16,6 +16,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio_pte 11 GPIO_ACTIVE_HIGH>; + off-on-delay-us = <20000>; enable-active-high; }; }; diff --git a/arch/arm64/boot/dts/freescale/imx8dxl-phantom-mek.dtsi b/arch/arm64/boot/dts/freescale/imx8dxl-phantom-mek.dtsi index 3dd374a024ba..53a241d44c43 100755 --- a/arch/arm64/boot/dts/freescale/imx8dxl-phantom-mek.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8dxl-phantom-mek.dtsi @@ -86,7 +86,7 @@ regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; gpio = <&lsio_gpio4 19 GPIO_ACTIVE_HIGH>; - off-on-delay = <3480>; + off-on-delay-us = <3480>; enable-active-high; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mm-evk.dts b/arch/arm64/boot/dts/freescale/imx8mm-evk.dts index 0dd0afcbbfdb..43f118ddb524 100755 --- a/arch/arm64/boot/dts/freescale/imx8mm-evk.dts +++ b/arch/arm64/boot/dts/freescale/imx8mm-evk.dts @@ -48,7 +48,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio2 10 GPIO_ACTIVE_HIGH>; - off-on-delay = <20000>; + off-on-delay-us = <20000>; startup-delay-us = <100>; enable-active-high; }; @@ -61,6 +61,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>; + off-on-delay-us = <20000>; enable-active-high; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts b/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts index 78c21a49fdea..6b635ff2c1c3 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts +++ b/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts @@ -38,6 +38,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>; + off-on-delay-us = <12000>; enable-active-high; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mq-evk.dts b/arch/arm64/boot/dts/freescale/imx8mq-evk.dts index 30510b441898..761aa81087ff 100755 --- a/arch/arm64/boot/dts/freescale/imx8mq-evk.dts +++ b/arch/arm64/boot/dts/freescale/imx8mq-evk.dts @@ -79,6 +79,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>; + off-on-delay-us = <20000>; enable-active-high; }; diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek.dts index 108e6c1caf26..ab5252d7be0d 100755 --- a/arch/arm64/boot/dts/freescale/imx8qm-mek.dts +++ b/arch/arm64/boot/dts/freescale/imx8qm-mek.dts @@ -143,6 +143,7 @@ regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; gpio = <&lsio_gpio4 7 GPIO_ACTIVE_HIGH>; + off-on-delay-us = <4800>; enable-active-high; }; diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts index 948ad3bd0f6b..247f5d9ab1f6 100755 --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts @@ -117,6 +117,7 @@ regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; gpio = <&lsio_gpio4 19 GPIO_ACTIVE_HIGH>; + off-on-delay-us = <3480>; enable-active-high; }; |