diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2014-03-05 15:57:20 -0700 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2015-12-26 14:05:54 +0100 |
| commit | 1adbe34139fdfabded29d46ccbe5511c03785715 (patch) | |
| tree | 37a53246cfdbc90ca4e625e85955448a194d9d62 /drivers | |
| parent | a44abe2f6145530a7f2abc30942593ac5dc21b95 (diff) | |
ov5640_mipi: fix csi/ipu check for imx6dl
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/mxc/capture/ov5640_mipi.c | 14 |
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 390c52380c8d..bdcf631ba69e 100644 --- a/drivers/media/platform/mxc/capture/ov5640_mipi.c +++ b/drivers/media/platform/mxc/capture/ov5640_mipi.c @@ -2155,17 +2155,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", |