summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/marvell-ccic
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2015-03-14 08:47:01 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-05-01 07:50:28 -0300
commit8380b7e449d800037330011c4e0ab5caeab91a6b (patch)
tree5c1575a7cd04d7039db3b5f5df2d257403b7f48d /drivers/media/platform/marvell-ccic
parent85ad0a3f68f0ae223293282aecc87fb233a2dda5 (diff)
downloadblackbird-obmc-linux-8380b7e449d800037330011c4e0ab5caeab91a6b.tar.gz
blackbird-obmc-linux-8380b7e449d800037330011c4e0ab5caeab91a6b.zip
[media] marvell-ccic: fix V4L2_PIX_FMT_SBGGR8 support
The REG_CTRL0 register was never written if this format was selected, instead an error was logged and whatever was last set in that register was used. Surprisingly, that seems to work if YUYV was selected, but we should program this register explicitly. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/marvell-ccic')
-rw-r--r--drivers/media/platform/marvell-ccic/mcam-core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c
index 7af4265e689e..42f63974592c 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -786,6 +786,10 @@ static void mcam_ctlr_image(struct mcam_camera *cam)
mcam_reg_write_mask(cam, REG_CTRL0,
C0_DF_RGB | C0_RGBF_565 | C0_RGB5_BGGR, C0_DF_MASK);
break;
+ case V4L2_PIX_FMT_SBGGR8:
+ mcam_reg_write_mask(cam, REG_CTRL0,
+ C0_DF_RGB | C0_RGB5_GRBG, C0_DF_MASK);
+ break;
default:
cam_err(cam, "camera: unknown format: %#x\n", fmt->pixelformat);
break;
OpenPOWER on IntegriCloud