public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[media] omap3isp: csi2: Add V4L2_MBUS_FMT_YUYV8_2X8 support

Browse source 
Tested with ov9740 and

struct isp_csi2_platform_data {
	.interface = ISP_INTERFACE_CSI2A_PHY2,
	.bus = {
		.csi2 = {
			.crc		= 1,
			.vpclk_div	= 1,
		}
	},
}

Signed-off-by: Ivaylo Petrov <ivpetrov@mm-sol.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Ivaylo Petrov 2011-09-12 06:54:09 -03:00 • committed by Mauro Carvalho Chehab
parent 0810fd9c53
commit 73cdc79f93
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/media/video/omap3isp/ispcsi2.c
View file

@ -96,11 +96,12 @@ static const unsigned int csi2_input_fmts[] = {
V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8, V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8,
V4L2_MBUS_FMT_SGBRG10_1X10, V4L2_MBUS_FMT_SGBRG10_1X10,
V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8, V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8,
V4L2_MBUS_FMT_YUYV8_2X8,
}; };
/* To set the format on the CSI2 requires a mapping function that takes /* To set the format on the CSI2 requires a mapping function that takes
* the following inputs: * the following inputs:
* - 2 different formats (at this time) * - 3 different formats (at this time)
* - 2 destinations (mem, vp+mem) (vp only handled separately) * - 2 destinations (mem, vp+mem) (vp only handled separately)
* - 2 decompression options (on, off) * - 2 decompression options (on, off)
* - 2 isp revisions (certain format must be handled differently on OMAP3630) * - 2 isp revisions (certain format must be handled differently on OMAP3630)
@ -108,7 +109,7 @@ static const unsigned int csi2_input_fmts[] = {
* Array indices as follows: [format][dest][decompr][is_3630] * Array indices as follows: [format][dest][decompr][is_3630]
* Not all combinations are valid. 0 means invalid. * Not all combinations are valid. 0 means invalid.
*/ */
static const u16 __csi2_fmt_map[2][2][2][2] = { static const u16 __csi2_fmt_map[3][2][2][2] = {
/* RAW10 formats */ /* RAW10 formats */
{ {
/* Output to memory */ /* Output to memory */
@ -147,6 +148,25 @@ static const u16 __csi2_fmt_map[2][2][2][2] = {
CSI2_USERDEF_8BIT_DATA1_DPCM10_VP }, CSI2_USERDEF_8BIT_DATA1_DPCM10_VP },
}, },
}, },
/* YUYV8 2X8 formats */
{
/* Output to memory */
{
/* No DPCM decompression */
{ CSI2_PIX_FMT_YUV422_8BIT,
CSI2_PIX_FMT_YUV422_8BIT },
/* DPCM decompression */
{ 0, 0 },
},
/* Output to both */
{
/* No DPCM decompression */
{ CSI2_PIX_FMT_YUV422_8BIT_VP,
CSI2_PIX_FMT_YUV422_8BIT_VP },
/* DPCM decompression */
{ 0, 0 },
},
},
}; };
/* /*
@ -173,6 +193,9 @@ static u16 csi2_ctx_map_format(struct isp_csi2_device *csi2)
case V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8: case V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8:
fmtidx = 1; fmtidx = 1;
break; break;
case V4L2_MBUS_FMT_YUYV8_2X8:
fmtidx = 2;
break;
default: default:
WARN(1, KERN_ERR "CSI2: pixel format %08x unsupported!\n", WARN(1, KERN_ERR "CSI2: pixel format %08x unsupported!\n",
fmt->code); fmt->code);