summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanusz Krzysztofik <jmkrzyszt@gmail.com>2019-03-24 20:21:12 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-25 18:25:19 +0200
commitc65f75512cad37a5ae1936344296869b69d6109f (patch)
treeaa8d2f9ebf290f6beb82ee1f60775256123ea6d4
parentc71309f3fe206840229df3b82a940ad1286beae9 (diff)
downloadlinux-stable-c65f75512cad37a5ae1936344296869b69d6109f.tar.gz
linux-stable-c65f75512cad37a5ae1936344296869b69d6109f.tar.bz2
linux-stable-c65f75512cad37a5ae1936344296869b69d6109f.zip
media: ov6650: Fix sensor possibly not detected on probe
commit 933c1320847f5ed6b61a7d10f0a948aa98ccd7b0 upstream. After removal of clock_start() from before soc_camera_init_i2c() in soc_camera_probe() by commit 9aea470b399d ("[media] soc-camera: switch I2C subdevice drivers to use v4l2-clk") introduced in v3.11, the ov6650 driver could no longer probe the sensor successfully because its clock was no longer turned on in advance. The issue was initially worked around by adding that missing clock_start() equivalent to OMAP1 camera interface driver - the only user of this sensor - but a propoer fix should be rather implemented in the sensor driver code itself. Fix the issue by inserting a delay between the clock is turned on and the sensor I2C registers are read for the first time. Tested on Amstrad Delta with now out of tree but still locally maintained omap1_camera host driver. Fixes: 9aea470b399d ("[media] soc-camera: switch I2C subdevice drivers to use v4l2-clk") Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/media/i2c/ov6650.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/i2c/ov6650.c b/drivers/media/i2c/ov6650.c
index 768f2950ea36..07bc819f5819 100644
--- a/drivers/media/i2c/ov6650.c
+++ b/drivers/media/i2c/ov6650.c
@@ -826,6 +826,8 @@ static int ov6650_video_probe(struct i2c_client *client)
if (ret < 0)
return ret;
+ msleep(20);
+
/*
* check and show product ID and manufacturer ID
*/