diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2019-06-25 15:52:00 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-04-15 01:24:40 +0200 |
| commit | 3c5b37981bcd0debbd6644f540d2ea521fca3d9e (patch) | |
| tree | deb5a9a3f0683ea8a74d2f0c604030c1f234b8b3 /arch | |
| parent | 34ecdefa58898b03b6f99d620071ccc0dd3834f7 (diff) | |
ARM: dts (ds): imx6ull-colibri: Use wifi from mainline
This takes the mainline part that adds the wifi chip. This patch
solves the issue that exists when resuming from suspend.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi index 5d98763b1677..12c9ddba144d 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi @@ -9,16 +9,12 @@ #include "imx6ull-colibri.dtsi" / { - reg_wifi_pwd: regulator-wifi-pwd { - compatible = "regulator-fixed"; + + wifi_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_wifi_pdn>; - gpio = <&gpio5 11 0>; - enable-active-high; - regulator-always-on; - regulator-name = "WIFI_PDN"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; + reset-gpios = <&gpio5 11 GPIO_ACTIVE_LOW>; }; }; @@ -40,16 +36,12 @@ assigned-clocks = <&clks IMX6UL_CLK_USDHC2_SEL>, <&clks IMX6UL_CLK_USDHC2>; assigned-clock-parents = <&clks IMX6UL_CLK_PLL2_PFD2>; assigned-clock-rates = <0>, <198000000>; - no-1-8-v; - disable-wp; - enable-sdio-wakeup; + cap-power-off-card; keep-power-in-suspend; - broken-cd; - /* non-removable;*/ + mmc-pwrseq = <&wifi_pwrseq>; + no-1-8-v; + non-removable; + vmmc-supply = <®_module_3v3>; + wakeup-source; status = "okay"; - /* - * Does not work for a WiFi chip since vmmc get turned on only during - * SDIO communication... - */ -// vmmc-supply = <®_wifi_pwd>; }; |