ARM64: boot: dts: verdin-imx8mm: add wifi layer

Move the on-module Wi-Fi part of a Toradex Verdin iMX8MM module
to a separate file.

Related-to: ELB-2322
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

3 files changed, 58 insertions, 48 deletions

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mm-verdin-dev.dts b/arch/arm64/boot/dts/freescale/fsl-imx8mm-verdin-dev.dts
index 21aa2ccf88e3..063db4fea571 100755
--- a/arch/arm64/boot/dts/freescale/fsl-imx8mm-verdin-dev.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8mm-verdin-dev.dts
@@ -5,7 +5,7 @@
 
 /dts-v1/;
 
-#include "fsl-imx8mm-verdin.dtsi"
+#include "fsl-imx8mm-verdin-wifi.dtsi"
 
 / {
 	model = "Toradex Verdin iMX8M Mini WB on Verdin Development Board";
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mm-verdin-wifi.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8mm-verdin-wifi.dtsi
new file mode 100755
index 000000000000..aebe517e1a68
--- /dev/null
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8mm-verdin-wifi.dtsi
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+/*
+ * Copyright 2020 Toradex
+ */
+
+#include "fsl-imx8mm-verdin.dtsi"
+
+/ {
+	reg_wifi_en: regulator-wifi-en {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio3 25 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_wifi_pwr_en>;
+		regulator-name = "V3.3_WI-FI";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		startup-delay-us = <2000>;
+	};
+};
+
+/* On-module Wi-Fi */
+&usdhc3 {
+	bus-width = <4>;
+	non-removable;
+	pinctrl-names = "default", "state_100mhz", "state_200mhz";
+	pinctrl-0 = <&pinctrl_usdhc3>, <&pinctrl_wifi_ctrl>;
+	pinctrl-1 = <&pinctrl_usdhc3_100mhz>, <&pinctrl_wifi_ctrl>;
+	pinctrl-2 = <&pinctrl_usdhc3_200mhz>, <&pinctrl_wifi_ctrl>;
+	vmmc-supply = <&reg_wifi_en>;
+	status = "okay";
+};
+
+&iomuxc {
+	pinctrl_wifi_ctrl: wifictrlgrp {
+		fsl,pins = <
+			MX8MM_IOMUXC_NAND_READY_B_GPIO3_IO16	0x1c4		/* WIFI_WKUP_BT */
+			MX8MM_IOMUXC_SD1_RESET_B_GPIO2_IO10	0x1c4		/* WIFI_WKUP_WLAN */
+			MX8MM_IOMUXC_SAI1_RXD7_GPIO4_IO9	0x1c4		/* WIFI_W_WKUP_HOST */
+		>;
+	};
+
+	pinctrl_wifi_i2s: bti2sgrp {
+		fsl,pins = <
+			MX8MM_IOMUXC_SAI1_RXD4_SAI6_TX_BCLK	0xd6		/* WIFI_TX_BCLK */
+			MX8MM_IOMUXC_SAI1_RXD5_SAI6_TX_DATA0	0xd6		/* WIFI_TX_DATA0 */
+			MX8MM_IOMUXC_SAI1_RXD6_SAI6_TX_SYNC	0xd6		/* WIFI_TX_SYNC */
+			MX8MM_IOMUXC_SAI1_TXD5_SAI6_RX_DATA0	0xd6		/* WIFI_RX_DATA0 */
+		>;
+	};
+
+	pinctrl_wifi_pwr_en: wifipwrengrp {
+		fsl,pins = <
+			MX8MM_IOMUXC_SAI5_MCLK_GPIO3_IO25	0x184		/* PMIC_EN_WIFI */
+		>;
+	};
+};
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mm-verdin.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8mm-verdin.dtsi
index 1a06e5285792..9b773e412164 100755
--- a/arch/arm64/boot/dts/freescale/fsl-imx8mm-verdin.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8mm-verdin.dtsi
@@ -95,18 +95,6 @@
 		off-on-delay = <100000>;
 	};
 
-	reg_wifi_en: regulator-wifi-en {
-		compatible = "regulator-fixed";
-		enable-active-high;
-		gpio = <&gpio3 25 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_wifi_pwr_en>;
-		regulator-name = "V3.3_WI-FI";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		startup-delay-us = <2000>;
-	};
-
 	sound {
 		compatible = "simple-audio-card";
 		simple-audio-card,bitclock-master = <&dailink_master>;
@@ -743,18 +731,6 @@
 	status = "okay";
 };
 
-/* On-module Wi-Fi */
-&usdhc3 {
-	bus-width = <4>;
-	non-removable;
-	pinctrl-names = "default", "state_100mhz", "state_200mhz";
-	pinctrl-0 = <&pinctrl_usdhc3>, <&pinctrl_wifi_ctrl>;
-	pinctrl-1 = <&pinctrl_usdhc3_100mhz>, <&pinctrl_wifi_ctrl>;
-	pinctrl-2 = <&pinctrl_usdhc3_200mhz>, <&pinctrl_wifi_ctrl>;
-	vmmc-supply = <&reg_wifi_en>;
-	status = "okay";
-};
-
 &vpu_g1 {
 	status = "okay";
 };
@@ -1249,27 +1225,4 @@
 			MX8MM_IOMUXC_GPIO1_IO02_WDOG1_WDOG_B	0xc6
 		>;
 	};
-
-	pinctrl_wifi_ctrl: wifictrlgrp {
-		fsl,pins = <
-			MX8MM_IOMUXC_NAND_READY_B_GPIO3_IO16	0x1c4		/* WIFI_WKUP_BT */
-			MX8MM_IOMUXC_SD1_RESET_B_GPIO2_IO10	0x1c4		/* WIFI_WKUP_WLAN */
-			MX8MM_IOMUXC_SAI1_RXD7_GPIO4_IO9	0x1c4		/* WIFI_W_WKUP_HOST */
-		>;
-	};
-
-	pinctrl_wifi_i2s: wifii2sgrp {
-		fsl,pins = <
-			MX8MM_IOMUXC_SAI1_RXD4_SAI6_TX_BCLK	0xd6
-			MX8MM_IOMUXC_SAI1_RXD5_SAI6_TX_DATA0	0xd6
-			MX8MM_IOMUXC_SAI1_RXD6_SAI6_TX_SYNC	0xd6
-			MX8MM_IOMUXC_SAI1_TXD5_SAI6_RX_DATA0	0xd6
-		>;
-	};
-
-	pinctrl_wifi_pwr_en: wifipwrengrp {
-		fsl,pins = <
-			MX8MM_IOMUXC_SAI5_MCLK_GPIO3_IO25	0x184		/* PMIC_EN_WIFI */
-		>;
-	};
 };