summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTroy Kisky <troy.kisky@boundarydevices.com>2014-04-09 16:22:05 -0700
committerTroy Kisky <troy.kisky@boundarydevices.com>2014-04-24 18:59:51 -0700
commit33876660bab2b4f37aac5a66926044b90e9025b8 (patch)
treee1e328aa9ea9ac10f0855f3cb6bc87478e723a4e /drivers
parentfa6258e2ce3fad4adbe59110bf4351e5cb178911 (diff)
ov5640_mipi: software reset does not affect i2c address
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 8e5ae71ef413..5847fbeb5524 100644
--- a/drivers/media/platform/mxc/capture/ov5640_mipi.c
+++ b/drivers/media/platform/mxc/capture/ov5640_mipi.c
@@ -2071,6 +2071,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();
@@ -2079,7 +2080,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);
}