ARM: dts: imx7s-warp: Improve the Wifi description

GPIO5_10 is connected to the BCM43455 WL_REG_ON pin and it is better
descrbed via mmc-pwrseq-simple.yaml.

Also improve the Wifi devicetree description by passing a compatible
string that describes the BCM43455 presence as per brcm,bcm4329-fmac.yaml.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/nxp/imx/imx7s-warp.dts b/arch/arm/boot/dts/nxp/imx/imx7s-warp.dts
index b66e612d3329203d11daedf85276c857a5e62cee..f2cd95e992e74c04737184f3a7b217b8b8b95748 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx7s-warp.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx7s-warp.dts
@@ -31,18 +31,6 @@
                };
        };
 
-       reg_brcm: regulator-brcm {
-               compatible = "regulator-fixed";
-               enable-active-high;
-               gpio = <&gpio5 10 GPIO_ACTIVE_HIGH>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_brcm_reg>;
-               regulator-name = "brcm_reg";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               startup-delay-us = <200000>;
-       };
-
        reg_peri_3p15v: regulator-peri-3p15v {
                compatible = "regulator-fixed";
                regulator-name = "peri_3p15v_reg";
@@ -51,6 +39,14 @@
                regulator-always-on;
        };
 
+       sdio_pwrseq: sdio-pwrseq {
+               compatible = "mmc-pwrseq-simple";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_brcm_reg>;
+               post-power-on-delay-ms = <200>;
+               reset-gpios = <&gpio5 10 GPIO_ACTIVE_LOW>;
+       };
+
        sound {
                compatible = "simple-audio-card";
                simple-audio-card,name = "imx7-sgtl5000";
@@ -301,14 +297,21 @@
 };
 
 &usdhc1 {
+       #address-cells = <1>;
+       #size-cells = <0>;
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usdhc1>;
        bus-width = <4>;
        keep-power-in-suspend;
        no-1-8-v;
        non-removable;
-       vmmc-supply = <&reg_brcm>;
+       mmc-pwrseq = <&sdio_pwrseq>;
        status = "okay";
+
+       wifi@0 {
+               compatible = "brcm,bcm43455-fmac", "brcm,bcm4329-fmac";
+               reg = <0>;
+       };
 };
 
 &usdhc3 {