From: Josep Orga <jorga@somdevices.com>
Date: Sun, 22 Mar 2020 17:00:00 +0000 (+0100)
Subject: ARM:imx6ull-somdevices.dtsi:
X-Git-Tag: C0P2-H0.0--20200415~6
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=3f8a1aeb41a3f1f0bd28b116875d2bae7fe7ff13;p=linux.git

ARM:imx6ull-somdevices.dtsi:
	· Added RESET and CHIP_EN functionallity to WiFi.
	· Changed PMIC_INT GPIO.

Signed-off-by: Josep Orga <jorga@somdevices.com>
---

diff --git a/arch/arm/boot/dts/imx6ull-somdevices.dtsi b/arch/arm/boot/dts/imx6ull-somdevices.dtsi
index 4abf4abb6489..3f2da5737f4e 100644
--- a/arch/arm/boot/dts/imx6ull-somdevices.dtsi
+++ b/arch/arm/boot/dts/imx6ull-somdevices.dtsi
@@ -66,18 +66,6 @@
 			off-on-delay = <20000>;
 			enable-active-high;
 		};
-
-		reg_wlan_en: regulator@10 {
-			compatible = "regulator-fixed";
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_wifi_en>;
-			regulator-name = "wlan";
-			regulator-min-microvolt = <3300000>;
-			regulator-max-microvolt = <3300000>;
-			regulator-boot-on;
-			gpios = <&gpio5 7 0>;
-			startup-delay-us = <70000>;
-		};
 	};
 
 	leds {
@@ -91,6 +79,13 @@
 			linux,default-trigger = "heartbeat";
 		};
 	};
+
+	wifi_pwrseq: wifi_pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		reset-gpios =	<&gpio5 7 GPIO_ACTIVE_LOW>, //RESET
+						<&gpio5 6 GPIO_ACTIVE_LOW>; //CHIP_EN
+		post-power-on-delay-ms = <10>;
+	};
 };
 
 &cpu0 {
@@ -183,9 +178,9 @@
 	pmic: pf1550@08 {
 		compatible = "fsl,pf1550";
 		interrupt-parent = <&gpio5>;
-		interrupts = <4 8>;
+		interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
 		reg = <0x08>;
-		//pinctrl-0 = <&pinctrl_pf1550>;
+		pinctrl-0 = <&pinctrl_pf1550>;
 
 		onkey {
 			compatible = "fsl,pf1550-onkey";
@@ -573,6 +568,7 @@
 		pinctrl_hog_2: hoggrp-2 {
 			fsl,pins = <
 				MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00      0x80000000
+				MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04      0x80000000
 			>;
 		};
 
@@ -588,6 +584,12 @@
 				MX6ULL_PAD_SNVS_TAMPER9__GPIO5_IO09  0x1b0b0
 			>;
 		};
+
+		pinctrl_pf1550: pf1550 {
+			fsl,pins = <
+				MX6ULL_PAD_SNVS_TAMPER8__GPIO5_IO08      0x80000000
+			>;
+		};
 	};
 };
 
@@ -690,34 +692,20 @@
 };
 
 &usdhc1 {
-	/*pinctrl-names = "default", "state_100mhz", "state_200mhz";
-	pinctrl-0 = <&pinctrl_usdhc1>;
-	pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
-	pinctrl-2 = <&pinctrl_usdhc1_200mhz>;*/
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usdhc1>;
-	//cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
-	//no-1-8-v;
-	keep-power-in-suspend;
-	enable-sdio-wakeup;
+	mmc-pwrseq = <&wifi_pwrseq>;
+	cap-power-off-card;
 	non-removable;
-	wifi-host;
-	//vmmc-supply = <&reg_sd1_vmmc>;
-	//vmmc-supply = <&reg_wlan_en>;
 	bus-width = <4>;
 	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
 	wilc_sdio: wilc_sdio@0{
 		compatible = "microchip,wilc1000";
 		pinctrl-0 = <&pinctrl_wifi_en>;
 		status = "okay";
-			//interrupts = <5 IRQ_TYPE_EDGE_RISING>;
-			//gpio_irq = <&gpio5 5 0>;
-		gpio_reset = <&gpio5 7 0>;
-		//reset-gpios = <&gpio5 7 0>;
-		gpio_chip_en = <&gpio5 6 0>;
-		//chip_en-gpios = <&gpio5 6 0>;
 		reg = <0>;
-		bus-width = <4>;
 	};
 };