summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@nxp.com>2017-03-09 11:54:17 +0200
committerAnson Huang <Anson.Huang@nxp.com>2017-06-08 21:00:40 +0800
commitbcfb5dabd7ce00b9855551e45ec1eb18b99f8589 (patch)
treea28d882c986d44cec0f5a5ea5f3d5629d2d73886 /arch/arm/mach-imx
parent87532fb90e4736c30c6cda44c509ddad63cc305a (diff)
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>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/mach-imx6q.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 02e60e8b1755..b884209edaa6 100644
--- 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"))