diff options
| author | Shawn Guo <shawnguo@kernel.org> | 2018-12-10 10:32:51 +0800 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2018-12-10 10:32:51 +0800 |
| commit | 2e8566106d284badf6ec94509f77fdf7725d04b4 (patch) | |
| tree | 21e6edc1754cad60e06ed2152548815c0acb6846 /arch/arm/boot/dts/imx7d-nitrogen7.dts | |
| parent | 79da07dec740a42c70963ebacbd2bf8866af9e20 (diff) | |
| parent | f15096f12a4e9340168df5fdd9201aa8ed60d59e (diff) | |
Merge tag 'imx-fixes-4.20-3' into imx7d/pico
i.MX fixes for 4.20, round 3:
- A couple of fixes on imx7d-pico and imx7d-nitrogen7 boards to correct
the description of the Wifi clock.
- Change SW2ISO count to get a safer ARM LDO ramp-up time, so that
different boards can be covered. This fixes the ARM LDO failure seen
on some customer boards.
Diffstat (limited to 'arch/arm/boot/dts/imx7d-nitrogen7.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx7d-nitrogen7.dts | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx7d-nitrogen7.dts b/arch/arm/boot/dts/imx7d-nitrogen7.dts index 4fb7e84610c7..6b4acea1ef79 100644 --- a/arch/arm/boot/dts/imx7d-nitrogen7.dts +++ b/arch/arm/boot/dts/imx7d-nitrogen7.dts @@ -87,13 +87,17 @@ compatible = "regulator-fixed"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - clocks = <&clks IMX7D_CLKO2_ROOT_DIV>; - clock-names = "slow"; regulator-name = "reg_wlan"; startup-delay-us = <70000>; gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>; enable-active-high; }; + + usdhc2_pwrseq: usdhc2_pwrseq { + compatible = "mmc-pwrseq-simple"; + clocks = <&clks IMX7D_CLKO2_ROOT_DIV>; + clock-names = "ext_clock"; + }; }; &adc1 { @@ -376,6 +380,7 @@ bus-width = <4>; non-removable; vmmc-supply = <®_wlan>; + mmc-pwrseq = <&usdhc2_pwrseq>; cap-power-off-card; keep-power-in-suspend; status = "okay"; |