[PATCH 3/6] ARM: dts: imx6qdl-smarc-samx6i: remove iomuxc hog

[Marco Felsch]

Move the muxing into the gpioX nodes so we can get rid of the iomuxc
hog. While on it set the correct mux config and don't rely on the reset
value.

Signed-off-by: Marco Felsch <m.felsch at pengutronix.de>
---
 arch/arm/dts/imx6qdl-smarc-samx6i.dtsi | 37 +++++++++++++++++---------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/arch/arm/dts/imx6qdl-smarc-samx6i.dtsi b/arch/arm/dts/imx6qdl-smarc-samx6i.dtsi
index 363da66ec7..1381a551d0 100644
--- a/arch/arm/dts/imx6qdl-smarc-samx6i.dtsi
+++ b/arch/arm/dts/imx6qdl-smarc-samx6i.dtsi
@@ -129,6 +129,16 @@
 	status = "okay";
 };
 
+&gpio2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_gpio2_hog>;
+};
+
+&gpio6 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_gpio6_hog>;
+};
+
 &i2c_pfuze {
 	pfuze100 at 08 {
 		compatible = "fsl,pfuze100";
@@ -352,18 +362,6 @@
 };
 
 &iomuxc {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_boot>;
-
-	pinctrl_boot: boot {
-		fsl,pins = <
-			/* GPIOS for version and id detection */
-			MX6QDL_PAD_NANDF_CLE__GPIO6_IO07	0x80000000
-			MX6QDL_PAD_NANDF_WP_B__GPIO6_IO09	0x80000000
-			MX6QDL_PAD_NANDF_D2__GPIO2_IO02		0x80000000
-		>;
-	};
-
 	pinctrl_flexcan1: flexcan1-smarc {
 		fsl,pins = <
 			MX6QDL_PAD_GPIO_7__FLEXCAN1_TX 0x80000000
@@ -378,6 +376,21 @@
 		>;
 	};
 
+	pinctrl_gpio2_hog: gpio2-hog {
+		fsl,pins = <
+			/* GPIO for version detection */
+			MX6QDL_PAD_NANDF_D2__GPIO2_IO02		0xb0b0
+		>;
+	};
+
+	pinctrl_gpio6_hog: gpio6-hog {
+		fsl,pins = <
+			/* GPIOs for ddr3 size detection */
+			MX6QDL_PAD_NANDF_CLE__GPIO6_IO07	0xb0b0
+			MX6QDL_PAD_NANDF_WP_B__GPIO6_IO09	0xb0b0
+		>;
+	};
+
 	pinctrl_enet_smarc: fecgrp-smarc {
 		fsl,pins = <
 			MX6QDL_PAD_ENET_MDIO__ENET_MDIO       0x1b0b0
-- 
2.20.1