summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2011-10-14 22:09:55 +0100
committerDaniel Drake <dsd@laptop.org>2011-10-17 10:02:47 +0100
commit5d76efb5df8c6b1d181c47b17b1d1e9a39ef66b6 (patch)
treee8063e194cd7acc89b02bee4e1f6a91a7821378e
parentc2bd7b9105feec1ae3fdd47107be8bfa265418a1 (diff)
downloadolpc-kernel-5d76efb5df8c6b1d181c47b17b1d1e9a39ef66b6.zip
olpc-kernel-5d76efb5df8c6b1d181c47b17b1d1e9a39ef66b6.tar.gz
olpc-kernel-5d76efb5df8c6b1d181c47b17b1d1e9a39ef66b6.tar.bz2
ov7670: Disable non-YUV modes on XO-1.5 (#11297)
Non YUV modes cannot be scaled by the via-camera driver without messing up the colours in the image.
-rw-r--r--drivers/media/video/ov7670.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c
index f5fc1cf..cf5ec43 100644
--- a/drivers/media/video/ov7670.c
+++ b/drivers/media/video/ov7670.c
@@ -591,6 +591,7 @@ static struct ov7670_format_struct {
.cmatrix = { 128, -128, 0, -34, -94, 128 },
.bpp = 2,
},
+#ifndef CONFIG_OLPC_XO_1_5 /* http://dev.laptop.org/ticket/11297 */
{
.desc = "RGB 444",
.pixelformat = V4L2_PIX_FMT_RGB444,
@@ -612,6 +613,7 @@ static struct ov7670_format_struct {
.cmatrix = { 0, 0, 0, 0, 0, 0 },
.bpp = 1
},
+#endif
};
#define N_OV7670_FMTS ARRAY_SIZE(ov7670_formats)