summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTroy Kisky <troy.kisky@boundarydevices.com>2014-04-09 16:22:05 -0700
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-01-10 23:10:29 +0100
commita26957bd966f8b653ee25f38330b2d9c16efb2ed (patch)
tree6141b50c8d5f366ec26a65918874252e256f2ea2 /drivers
parentf157011ef74dd94d57cc666518ccfca889b87d64 (diff)
ov5640_mipi: software reset does not affect i2c address
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit c4b9844b183e2a067bfdc0b4a79a8f8142df0923)
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/platform/mxc/capture/ov5640_mipi.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/platform/mxc/capture/ov5640_mipi.c b/drivers/media/platform/mxc/capture/ov5640_mipi.c
index da75a6b6cda9..57194678bc29 100644
--- a/drivers/media/platform/mxc/capture/ov5640_mipi.c
+++ b/drivers/media/platform/mxc/capture/ov5640_mipi.c
@@ -815,6 +815,7 @@ static s32 ov5640_write_reg(u16 reg, u8 val)
au8Buf[1] = reg & 0xff;
au8Buf[2] = val;
+#if 0 /* Software reset does not affect the i2c address register like it does on ov5642 */
if ((reg == 0x3008) && (val & 0x80)) {
mxc_camera_common_lock();
@@ -822,7 +823,9 @@ static s32 ov5640_write_reg(u16 reg, u8 val)
update_device_addr(&ov5640_data);
mxc_camera_common_unlock();
- } else {
+ } else
+#endif
+ {
ret = i2c_master_send(ov5640_data.i2c_client, au8Buf, 3);
}