ENGR00278683-1 [iMX6DLQ]: Add IOMUX configuration for IPU1 CSI0

Add IOMUX configuration for IPU1 CSI0 for SabreSD and SabreAuto. This
enables parallel CSI port required for OV564x on SabreSD and ADV7180
on SabreAuto.

Signed-off-by: Oliver Brown <oliver.brown@freescale.com>

1 files changed, 30 insertions, 0 deletions

diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index fac290ae49ff..e92ee05b98a8 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -168,6 +168,35 @@ static void __init imx6q_1588_init(void)
 
 }
 
+static void __init imx6q_csi_mux_init(void)
+{
+        /*
+         * MX6Q SabreSD board:
+         * IPU1 CSI0 connects to parallel interface.
+         * Set GPR1 bit 19 to 0x1.
+         *
+         * MX6DL SabreSD board:
+         * IPU1 CSI0 connects to parallel interface.
+         * Set GPR13 bit 0-2 to 0x4.
+         * IPU1 CSI1 connects to MIPI CSI2 virtual channel 1.
+         * Set GPR13 bit 3-5 to 0x1.
+         */
+        struct regmap *gpr;
+
+        gpr = syscon_regmap_lookup_by_compatible("fsl,imx6q-iomuxc-gpr");
+        if (!IS_ERR(gpr)) {
+                if (of_machine_is_compatible("fsl,imx6q-sabresd") ||
+                        of_machine_is_compatible("fsl,imx6q-sabreauto"))
+                        regmap_update_bits(gpr, IOMUXC_GPR1, 1 << 19, 1 << 19);
+                else if (of_machine_is_compatible("fsl,imx6dl-sabresd") ||
+                         of_machine_is_compatible("fsl,imx6dl-sabreauto"))
+                        regmap_update_bits(gpr, IOMUXC_GPR13, 0x3F, 0x0C);
+        } else {
+                pr_err("%s(): failed to find fsl,imx6q-iomux-gpr regmap\n",
+                       __func__);
+        }
+}
+
 /*
  * Disable Hannstar LVDS panel CABC function.
  * This function turns the panel's backlight density automatically
@@ -215,6 +244,7 @@ static void __init imx6q_init_machine(void)
         imx_anatop_init();
         imx6_pm_init();
         imx6q_1588_init();
+        imx6q_csi_mux_init();
         imx6q_lvds_cabc_init();
 }