Commit 662cf98d authored by Tomi Valkeinen's avatar Tomi Valkeinen Committed by Hans Verkuil
Browse files

media: ti: cal: Clean up mbus formats uses 



Clean up the CAL drivers uses of mbus formats:

- Switch all YUV formats from 2X8 formats to 1X16, as those are what
  should be used for CSI-2 bus.

- Drop 24 and 32 bit formats, as the driver doesn't support them (see
  cal_ctx_pix_proc_config()).

- Switch RGB565_2X8_LE to RGB565_1X16 (for the same reason as for the
  YUV formats) and drop RGB565_2X8_BE as it cannot be supported with
  CSI-2.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: default avatarJacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent cd063027

drivers/media/platform/ti/cal/cal-camerarx.c

+1 −1
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ static int cal_camerarx_sd_init_cfg(struct v4l2_subdev *sd, 
		.format = {

			.width = 640,

			.height = 480,

			.code = MEDIA_BUS_FMT_UYVY8_2X8,

			.code = MEDIA_BUS_FMT_UYVY8_1X16,

			.field = V4L2_FIELD_NONE,

			.colorspace = V4L2_COLORSPACE_SRGB,

			.ycbcr_enc = V4L2_YCBCR_ENC_601,

drivers/media/platform/ti/cal/cal-video.c

+1 −1
Original line number Diff line number Diff line
@@ -894,7 +894,7 @@ static int cal_ctx_v4l2_init_mc_format(struct cal_ctx *ctx) 
	const struct cal_format_info *fmtinfo;

	struct v4l2_pix_format *pix_fmt = &ctx->v_fmt.fmt.pix;



	fmtinfo = cal_format_by_code(MEDIA_BUS_FMT_UYVY8_2X8);

	fmtinfo = cal_format_by_code(MEDIA_BUS_FMT_UYVY8_1X16);

	if (!fmtinfo)

		return -EINVAL;

drivers/media/platform/ti/cal/cal.c

+6 −30
Original line number Diff line number Diff line
@@ -61,48 +61,24 @@ MODULE_PARM_DESC(mc_api, "activates the MC API"); 
const struct cal_format_info cal_formats[] = {

	{

		.fourcc		= V4L2_PIX_FMT_YUYV,

		.code		= MEDIA_BUS_FMT_YUYV8_2X8,

		.code		= MEDIA_BUS_FMT_YUYV8_1X16,

		.bpp		= 16,

	}, {

		.fourcc		= V4L2_PIX_FMT_UYVY,

		.code		= MEDIA_BUS_FMT_UYVY8_2X8,

		.code		= MEDIA_BUS_FMT_UYVY8_1X16,

		.bpp		= 16,

	}, {

		.fourcc		= V4L2_PIX_FMT_YVYU,

		.code		= MEDIA_BUS_FMT_YVYU8_2X8,

		.code		= MEDIA_BUS_FMT_YVYU8_1X16,

		.bpp		= 16,

	}, {

		.fourcc		= V4L2_PIX_FMT_VYUY,

		.code		= MEDIA_BUS_FMT_VYUY8_2X8,

		.code		= MEDIA_BUS_FMT_VYUY8_1X16,

		.bpp		= 16,

	}, {

		.fourcc		= V4L2_PIX_FMT_RGB565, /* gggbbbbb rrrrrggg */

		.code		= MEDIA_BUS_FMT_RGB565_2X8_LE,

		.fourcc		= V4L2_PIX_FMT_RGB565,

		.code		= MEDIA_BUS_FMT_RGB565_1X16,

		.bpp		= 16,

	}, {

		.fourcc		= V4L2_PIX_FMT_RGB565X, /* rrrrrggg gggbbbbb */

		.code		= MEDIA_BUS_FMT_RGB565_2X8_BE,

		.bpp		= 16,

	}, {

		.fourcc		= V4L2_PIX_FMT_RGB555, /* gggbbbbb arrrrrgg */

		.code		= MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,

		.bpp		= 16,

	}, {

		.fourcc		= V4L2_PIX_FMT_RGB555X, /* arrrrrgg gggbbbbb */

		.code		= MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE,

		.bpp		= 16,

	}, {

		.fourcc		= V4L2_PIX_FMT_RGB24, /* rgb */

		.code		= MEDIA_BUS_FMT_RGB888_2X12_LE,

		.bpp		= 24,

	}, {

		.fourcc		= V4L2_PIX_FMT_BGR24, /* bgr */

		.code		= MEDIA_BUS_FMT_RGB888_2X12_BE,

		.bpp		= 24,

	}, {

		.fourcc		= V4L2_PIX_FMT_RGB32, /* argb */

		.code		= MEDIA_BUS_FMT_ARGB8888_1X32,

		.bpp		= 32,

	}, {

		.fourcc		= V4L2_PIX_FMT_SBGGR8,

		.code		= MEDIA_BUS_FMT_SBGGR8_1X8,