From: Dong Aisheng <b29396@freescale.com>
Date: Thu, 9 Apr 2015 09:05:24 +0000 (+0800)
Subject: MLK-10629-6 dts: imx7d-sdb: do not enable wlreg_on always
X-Git-Tag: C0P2-H0.0--20200415~4196
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=8b9dc8db3196a3880978fac516989420de1e7ca4;p=linux.git

MLK-10629-6 dts: imx7d-sdb: do not enable wlreg_on always

Broadcom WiFi requires reset by operating wlreg_on regulator
when doing insmod/rmmod.
Keep wlreg_on will cause card state wrong and unable to re-insmod.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit d65683e1d0717fa039ebd4c55562e6ee745354b7)
Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
---

diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index e24faaa7fd39..2379c9c0a12e 100644
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -122,8 +122,6 @@
 			regulator-name = "wlreg_on";
 			gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>;
 			enable-active-high;
-			regulator-boot-on;
-			regulator-always-on;
 		};
 	};