summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTroy Kisky <troy.kisky@boundarydevices.com>2014-03-05 15:57:20 -0700
committerTroy Kisky <troy.kisky@boundarydevices.com>2014-04-24 18:59:43 -0700
commit66ada6e6303573a55f6858bbfcb58d4d9ac570bd (patch)
treed0e355384007ba1c3a3b233e01eec848f37029dc
parent39d48307d65c0ce343d063d0000c6b97a93c518c (diff)
ov5640_mipi: fix csi/ipu check for imx6dl
-rw-r--r--drivers/media/platform/mxc/capture/ov5640_mipi.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/platform/mxc/capture/ov5640_mipi.c b/drivers/media/platform/mxc/capture/ov5640_mipi.c
index ba4ad9736d59..efb1d8921241 100644
--- a/drivers/media/platform/mxc/capture/ov5640_mipi.c
+++ b/drivers/media/platform/mxc/capture/ov5640_mipi.c
@@ -3455,17 +3455,17 @@ static int ov5640_probe(struct i2c_client *client,
gpr = syscon_regmap_lookup_by_compatible("fsl,imx6q-iomuxc-gpr");
if (!IS_ERR(gpr)) {
- if (sensor->csi == sensor->ipu_id) {
- if (of_machine_is_compatible("fsl,imx6q")) {
+ if (of_machine_is_compatible("fsl,imx6q")) {
+ if (sensor->csi == sensor->ipu_id) {
int mask = sensor->csi ? (1 << 20) : (1 << 19);
regmap_update_bits(gpr, IOMUXC_GPR1, mask, 0);
- } else if (of_machine_is_compatible("fsl,imx6dl")) {
- int mask = sensor->csi ? (7 << 3) : (7 << 0);
- int val = sensor->csi ? (3 << 3) : (0 << 0);
-
- regmap_update_bits(gpr, IOMUXC_GPR13, mask, val);
}
+ } else if (of_machine_is_compatible("fsl,imx6dl")) {
+ int mask = sensor->csi ? (7 << 3) : (7 << 0);
+ int val = sensor->csi ? (3 << 3) : (0 << 0);
+
+ regmap_update_bits(gpr, IOMUXC_GPR13, mask, val);
}
} else {
pr_err("%s: failed to find fsl,imx6q-iomux-gpr regmap\n",