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: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/platform/ti/cal/cal-camerarx.c b/drivers/media/platform/ti/cal/cal-camerarx.c
index 16ae52879a79bf5d53e28e1062e1409875cb4ad7..267089b0fea09ffd19fc754bad82a746c4bda1d4 100644 (file)
--- a/drivers/media/platform/ti/cal/cal-camerarx.c
+++ b/drivers/media/platform/ti/cal/cal-camerarx.c
@@ -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,

diff --git a/drivers/media/platform/ti/cal/cal-video.c b/drivers/media/platform/ti/cal/cal-video.c
index ca906a9e42229feb4170dd7a7fec540771965c20..ed92e23d4b167fb4aa330c0bc2bc69a87964a0ca 100644 (file)
--- a/drivers/media/platform/ti/cal/cal-video.c
+++ b/drivers/media/platform/ti/cal/cal-video.c
@@ -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;
 

diff --git a/drivers/media/platform/ti/cal/cal.c b/drivers/media/platform/ti/cal/cal.c
index ea4170d9b1cbe6cb3682f51876f53d8885377673..ee3bbba85e8a966f3e50ad8f81434d2ae67cfaa2 100644 (file)
--- a/drivers/media/platform/ti/cal/cal.c
+++ b/drivers/media/platform/ti/cal/cal.c
@@ -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,