[PATCH 21/23] pinmmux: i.MX: add pin mux support for i.MX7

[Sascha Hauer]

From: Juergen Borleis <jbe at pengutronix.de>

Signed-off-by Juergen Borleis <jbe at pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 drivers/pinctrl/imx-iomux-v3.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/imx-iomux-v3.c b/drivers/pinctrl/imx-iomux-v3.c
index 4b3f03389..1dc46e81a 100644
--- a/drivers/pinctrl/imx-iomux-v3.c
+++ b/drivers/pinctrl/imx-iomux-v3.c
@@ -24,6 +24,7 @@
 #include <pinctrl.h>
 #include <malloc.h>
 #include <mach/iomux-v3.h>
+#include <mach/generic.h>
 
 struct imx_iomux_v3 {
 	void __iomem *base;
@@ -41,7 +42,7 @@ static void imx_iomuxv3_setup_single(void __iomem *base, struct device_d *dev,
 		"mux: 0x%08x -> 0x%04x, conf: 0x%08x -> 0x%04x input: 0x%08x -> 0x%04x\n",
 		mux_val, mux_reg, conf_val, conf_reg, input_val, input_reg);
 
-	if (mux_reg)
+	if (mux_reg || cpu_is_mx7())
 		writel(mux_val, base + mux_reg);
 	if (conf_reg)
 		writel(conf_val, base + conf_reg);
@@ -209,6 +210,8 @@ static __maybe_unused struct of_device_id imx_iomux_v3_dt_ids[] = {
 	}, {
 		.compatible = "fsl,imx6ul-iomuxc",
 	}, {
+		.compatible = "fsl,imx7d-iomuxc",
+	}, {
 		/* sentinel */
 	}
 };
-- 
2.11.0