[media] platform: Make use of media_bus_format enum

In order to have subsytem agnostic media bus format definitions we've
moved media bus definition to include/uapi/linux/media-bus-format.h and
prefixed values with MEDIA_BUS_FMT instead of V4L2_MBUS_FMT.

Reference new definitions in all platform drivers.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

2 files changed, 11 insertions, 12 deletions

diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c
index 7a86c77bffa0..f0eeb6cd262c 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -106,61 +106,61 @@ static struct mcam_format_struct {
         __u32 pixelformat;
         int bpp;   /* Bytes per pixel */
         bool planar;
-        enum v4l2_mbus_pixelcode mbus_code;
+        u32 mbus_code;
 } mcam_formats[] = {
         {
                 .desc           = "YUYV 4:2:2",
                 .pixelformat    = V4L2_PIX_FMT_YUYV,
-                .mbus_code      = V4L2_MBUS_FMT_YUYV8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                 .bpp            = 2,
                 .planar         = false,
         },
         {
                 .desc           = "UYVY 4:2:2",
                 .pixelformat    = V4L2_PIX_FMT_UYVY,
-                .mbus_code      = V4L2_MBUS_FMT_YUYV8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                 .bpp            = 2,
                 .planar         = false,
         },
         {
                 .desc           = "YUV 4:2:2 PLANAR",
                 .pixelformat    = V4L2_PIX_FMT_YUV422P,
-                .mbus_code      = V4L2_MBUS_FMT_YUYV8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                 .bpp            = 2,
                 .planar         = true,
         },
         {
                 .desc           = "YUV 4:2:0 PLANAR",
                 .pixelformat    = V4L2_PIX_FMT_YUV420,
-                .mbus_code      = V4L2_MBUS_FMT_YUYV8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                 .bpp            = 2,
                 .planar         = true,
         },
         {
                 .desc           = "YVU 4:2:0 PLANAR",
                 .pixelformat    = V4L2_PIX_FMT_YVU420,
-                .mbus_code      = V4L2_MBUS_FMT_YUYV8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                 .bpp            = 2,
                 .planar         = true,
         },
         {
                 .desc           = "RGB 444",
                 .pixelformat    = V4L2_PIX_FMT_RGB444,
-                .mbus_code      = V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE,
+                .mbus_code      = MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE,
                 .bpp            = 2,
                 .planar         = false,
         },
         {
                 .desc           = "RGB 565",
                 .pixelformat    = V4L2_PIX_FMT_RGB565,
-                .mbus_code      = V4L2_MBUS_FMT_RGB565_2X8_LE,
+                .mbus_code      = MEDIA_BUS_FMT_RGB565_2X8_LE,
                 .bpp            = 2,
                 .planar         = false,
         },
         {
                 .desc           = "Raw RGB Bayer",
                 .pixelformat    = V4L2_PIX_FMT_SBGGR8,
-                .mbus_code      = V4L2_MBUS_FMT_SBGGR8_1X8,
+                .mbus_code      = MEDIA_BUS_FMT_SBGGR8_1X8,
                 .bpp            = 1,
                 .planar         = false,
         },
@@ -190,8 +190,7 @@ static const struct v4l2_pix_format mcam_def_pix_format = {
         .sizeimage      = VGA_WIDTH*VGA_HEIGHT*2,
 };
 
-static const enum v4l2_mbus_pixelcode mcam_def_mbus_code =
-                                        V4L2_MBUS_FMT_YUYV8_2X8;
+static const u32 mcam_def_mbus_code = MEDIA_BUS_FMT_YUYV8_2X8;
 
 
 /*
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.h b/drivers/media/platform/marvell-ccic/mcam-core.h
index e0e628cb98f9..60a8e1cfeff7 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.h
+++ b/drivers/media/platform/marvell-ccic/mcam-core.h
@@ -183,7 +183,7 @@ struct mcam_camera {
 
         /* Current operating parameters */
         struct v4l2_pix_format pix_format;
-        enum v4l2_mbus_pixelcode mbus_code;
+        u32 mbus_code;
 
         /* Locks */
         struct mutex s_mutex; /* Access to this structure */