From e7e4e9358864e1b056d857a8aca043f8a5553b8c Mon Sep 17 00:00:00 2001 From: Michael Grzeschik Date: Tue, 3 Aug 2010 06:37:55 -0300 Subject: [PATCH] --- yaml --- r: 208180 b: refs/heads/master c: d86097e19cef2f13a29fc37db0dad17b99b6d5f8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/mx2_camera.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9e1a5bfd8129..1cd0f896c0ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd9ebdbc0541b4e8ee145c81642d68332f79b932 +refs/heads/master: d86097e19cef2f13a29fc37db0dad17b99b6d5f8 diff --git a/trunk/drivers/media/video/mx2_camera.c b/trunk/drivers/media/video/mx2_camera.c index 8441ecac6b18..66ff174151b5 100644 --- a/trunk/drivers/media/video/mx2_camera.c +++ b/trunk/drivers/media/video/mx2_camera.c @@ -785,6 +785,8 @@ static int mx2_camera_set_bus_param(struct soc_camera_device *icd, if (ret < 0) return ret; + if (common_flags & SOCAM_PCLK_SAMPLE_RISING) + csicr1 |= CSICR1_REDGE; if (common_flags & SOCAM_PCLK_SAMPLE_FALLING) csicr1 |= CSICR1_INV_PCLK; if (common_flags & SOCAM_VSYNC_ACTIVE_HIGH)