MLK-14273: ARM: imx: mach-imx6q: fix csi mux setting for imx6qp

Currently, for imx6qp, the first camera interface is set as MIPI CSI.
However, for sabresd and sabreauto, this should be set as parallel.

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>

diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 02e60e8..b884209 100644 (file)
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -247,7 +247,9 @@ static void __init imx6q_csi_mux_init(void)
        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"))
+                       of_machine_is_compatible("fsl,imx6q-sabreauto") ||
+                       of_machine_is_compatible("fsl,imx6qp-sabresd") ||
+                       of_machine_is_compatible("fsl,imx6qp-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"))