From 35fcc48a4b5b844f4ab671a4a7b425a1f62170f5 Mon Sep 17 00:00:00 2001
From: Nate Drude <nate.d@variscite.com>
Date: Fri, 15 Mar 2024 14:44:06 -0500
Subject: [PATCH] imx8mp-var-som: fix pinctrl for 802.15.4

This makes the following improvements:
1. Move pinctrl to ecspi1 device
2. Define and use pinctrl_ecspi1_iw612 instead of relying on pinctrl_restouch

Signed-off-by: Nate Drude <nate.d@variscite.com>
---
 arch/arm64/boot/dts/freescale/imx8mp-var-som-wbe.dts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-var-som-wbe.dts b/arch/arm64/boot/dts/freescale/imx8mp-var-som-wbe.dts
index 5165af035992..4a6b4dec0756 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-var-som-wbe.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-var-som-wbe.dts
@@ -4,6 +4,7 @@
  *
  * Copyright 2023 Variscite Ltd.
  */
+ #include "imx8mp-pinfunc.h"
 
 /dts-v1/;
 /plugin/;
@@ -11,6 +12,7 @@
 &ecspi1 {
 	#address-cells = <1>;
 	#size-cells = <0>;
+	pinctrl-0 = <&pinctrl_ecspi1>, <&pinctrl_iw612_spi>;
 
 	/* Disable resistive touch controller on CS0 */
 	ads7846@0 {
@@ -20,11 +22,17 @@
 
 	/* Enable 802.15.4 SPI device on CS0 */
 	spidev@0 {
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_restouch>;
 		reg = <0>;
 		compatible = "var,spidev";
 		spi-max-frequency = <1000000>;
 		status = "okay";
 	};
 };
+
+&iomuxc {
+	pinctrl_iw612_spi: iw612_spi_grp {
+		fsl,pins = <
+			MX8MP_IOMUXC_GPIO1_IO12__GPIO1_IO12				0xc0
+		>;
+	};
+};