diff options
| author | Andy Duan <fugang.duan@nxp.com> | 2018-11-23 18:27:04 +0800 |
|---|---|---|
| committer | Bryan O'Donoghue <bryan.odonoghue@linaro.org> | 2019-01-25 16:14:17 +0000 |
| commit | fcf5f5636c14e1c9c54fe1c374f6cab1fd92aa3f (patch) | |
| tree | 4e4a14198a081d617d7c601f770b342dd1deac4f | |
| parent | 6b254490b4d7c52a4365f5c4b78358daa23cfe7f (diff) | |
MLK-20456 arm64: dts: imx8qm: keep wlreg_on regulator during system suspended
Keep wlreg_on regulator on during system suspended status due to
external wifi module power requirement. Also keep the old Murata
1CQ M.2 card support.
To set the PIN to "latch" status before the GPIO controller is power
off during suspend, and set the PIN to "PASS" status after GPIO
controller status restored during system resume back.
Reviewed-by: yang.tian <yang.tian@nxp.com>
Tested-by: yang.tian <yang.tian@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked from commit: 015599e40fd5cc942f8f6a8d4b6c3475440a114e)
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-imx8qm-mek.dtsi | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek.dtsi index a28078336c56..cdab7bb3654b 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek.dtsi @@ -85,10 +85,13 @@ epdev_on: fixedregulator@100 { compatible = "regulator-fixed"; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pinctrl_wlreg_on>; + pinctrl-1 = <&pinctrl_wlreg_on_sleep>; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-name = "epdev_on"; - gpio = <&gpio4 9 0>; + gpio = <&gpio1 13 0>; enable-active-high; }; @@ -438,7 +441,6 @@ SC_P_PCIE_CTRL0_CLKREQ_B_LSIO_GPIO4_IO27 0x04000021 SC_P_PCIE_CTRL0_WAKE_B_LSIO_GPIO4_IO28 0x04000021 SC_P_PCIE_CTRL0_PERST_B_LSIO_GPIO4_IO29 0x04000021 - SC_P_LVDS1_I2C0_SDA_LSIO_GPIO1_IO13 0x06000000 SC_P_USDHC2_RESET_B_LSIO_GPIO4_IO09 0x04000021 >; }; @@ -628,6 +630,18 @@ SC_P_SCU_GPIO0_07_SCU_DSC_RTC_CLOCK_OUTPUT_32K 0x20 >; }; + + pinctrl_wlreg_on: wlregongrp{ + fsl,pins = < + SC_P_LVDS1_I2C0_SDA_LSIO_GPIO1_IO13 0x06000000 + >; + }; + + pinctrl_wlreg_on_sleep: wlregon_sleepgrp{ + fsl,pins = < + SC_P_LVDS1_I2C0_SDA_LSIO_GPIO1_IO13 0x07800000 + >; + }; }; }; @@ -1091,7 +1105,7 @@ ext_osc = <1>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pciea &pinctrl_wifi>; - disable-gpio = <&gpio1 13 GPIO_ACTIVE_LOW>; + disable-gpio = <&gpio4 9 GPIO_ACTIVE_LOW>; reset-gpio = <&gpio4 29 GPIO_ACTIVE_LOW>; clkreq-gpio = <&gpio4 27 GPIO_ACTIVE_LOW>; epdev_on-supply = <&epdev_on>; |