[media] i2c: Make use of media_bus_format enum

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

Replace all references to the old definitions in i2c 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: 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>

14 files changed, 203 insertions, 203 deletions

diff --git a/drivers/media/i2c/soc_camera/imx074.c b/drivers/media/i2c/soc_camera/imx074.c
index 5b915936c3f3..ec89cfa927a2 100644
--- a/drivers/media/i2c/soc_camera/imx074.c
+++ b/drivers/media/i2c/soc_camera/imx074.c
@@ -71,7 +71,7 @@
 
 /* IMX074 has only one fixed colorspace per pixelcode */
 struct imx074_datafmt {
-        enum v4l2_mbus_pixelcode        code;
+        u32     code;
         enum v4l2_colorspace            colorspace;
 };
 
@@ -82,7 +82,7 @@ struct imx074 {
 };
 
 static const struct imx074_datafmt imx074_colour_fmts[] = {
-        {V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
 };
 
 static struct imx074 *to_imx074(const struct i2c_client *client)
@@ -91,7 +91,7 @@ static struct imx074 *to_imx074(const struct i2c_client *client)
 }
 
 /* Find a data format by a pixel code in an array */
-static const struct imx074_datafmt *imx074_find_datafmt(enum v4l2_mbus_pixelcode code)
+static const struct imx074_datafmt *imx074_find_datafmt(u32 code)
 {
         int i;
 
@@ -236,7 +236,7 @@ static int imx074_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
 }
 
 static int imx074_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if ((unsigned int)index >= ARRAY_SIZE(imx074_colour_fmts))
                 return -EINVAL;
diff --git a/drivers/media/i2c/soc_camera/mt9m001.c b/drivers/media/i2c/soc_camera/mt9m001.c
index dbd8c142d6ef..2e9a53502551 100644
--- a/drivers/media/i2c/soc_camera/mt9m001.c
+++ b/drivers/media/i2c/soc_camera/mt9m001.c
@@ -53,13 +53,13 @@
 
 /* MT9M001 has only one fixed colorspace per pixelcode */
 struct mt9m001_datafmt {
-        enum v4l2_mbus_pixelcode        code;
+        u32     code;
         enum v4l2_colorspace            colorspace;
 };
 
 /* Find a data format by a pixel code in an array */
 static const struct mt9m001_datafmt *mt9m001_find_datafmt(
-        enum v4l2_mbus_pixelcode code, const struct mt9m001_datafmt *fmt,
+        u32 code, const struct mt9m001_datafmt *fmt,
         int n)
 {
         int i;
@@ -75,14 +75,14 @@ static const struct mt9m001_datafmt mt9m001_colour_fmts[] = {
          * Order important: first natively supported,
          * second supported with a GPIO extender
          */
-        {V4L2_MBUS_FMT_SBGGR10_1X10, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
 };
 
 static const struct mt9m001_datafmt mt9m001_monochrome_fmts[] = {
         /* Order important - see above */
-        {V4L2_MBUS_FMT_Y10_1X10, V4L2_COLORSPACE_JPEG},
-        {V4L2_MBUS_FMT_Y8_1X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_Y10_1X10, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_Y8_1X8, V4L2_COLORSPACE_JPEG},
 };
 
 struct mt9m001 {
@@ -563,7 +563,7 @@ static struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = {
 };
 
 static int mt9m001_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                            enum v4l2_mbus_pixelcode *code)
+                            u32 *code)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9m001 *mt9m001 = to_mt9m001(client);
diff --git a/drivers/media/i2c/soc_camera/mt9m111.c b/drivers/media/i2c/soc_camera/mt9m111.c
index b51e8562e775..5992ea93257a 100644
--- a/drivers/media/i2c/soc_camera/mt9m111.c
+++ b/drivers/media/i2c/soc_camera/mt9m111.c
@@ -182,23 +182,23 @@ static struct mt9m111_context context_b = {
 
 /* MT9M111 has only one fixed colorspace per pixelcode */
 struct mt9m111_datafmt {
-        enum v4l2_mbus_pixelcode        code;
+        u32     code;
         enum v4l2_colorspace            colorspace;
 };
 
 static const struct mt9m111_datafmt mt9m111_colour_fmts[] = {
-        {V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG},
-        {V4L2_MBUS_FMT_YVYU8_2X8, V4L2_COLORSPACE_JPEG},
-        {V4L2_MBUS_FMT_UYVY8_2X8, V4L2_COLORSPACE_JPEG},
-        {V4L2_MBUS_FMT_VYUY8_2X8, V4L2_COLORSPACE_JPEG},
-        {V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_RGB565_2X8_LE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_RGB565_2X8_BE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_BGR565_2X8_LE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_BGR565_2X8_BE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_YVYU8_2X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_UYVY8_2X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_VYUY8_2X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_RGB565_2X8_LE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_RGB565_2X8_BE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_BGR565_2X8_LE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_BGR565_2X8_BE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB},
 };
 
 struct mt9m111 {
@@ -218,7 +218,7 @@ struct mt9m111 {
 
 /* Find a data format by a pixel code */
 static const struct mt9m111_datafmt *mt9m111_find_datafmt(struct mt9m111 *mt9m111,
-                                                enum v4l2_mbus_pixelcode code)
+                                                u32 code)
 {
         int i;
         for (i = 0; i < ARRAY_SIZE(mt9m111_colour_fmts); i++)
@@ -331,7 +331,7 @@ static int mt9m111_setup_rect_ctx(struct mt9m111 *mt9m111,
 }
 
 static int mt9m111_setup_geometry(struct mt9m111 *mt9m111, struct v4l2_rect *rect,
-                        int width, int height, enum v4l2_mbus_pixelcode code)
+                        int width, int height, u32 code)
 {
         struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev);
         int ret;
@@ -345,7 +345,7 @@ static int mt9m111_setup_geometry(struct mt9m111 *mt9m111, struct v4l2_rect *rec
         if (!ret)
                 ret = reg_write(WINDOW_HEIGHT, rect->height);
 
-        if (code != V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE) {
+        if (code != MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE) {
                 /* IFP in use, down-scaling possible */
                 if (!ret)
                         ret = mt9m111_setup_rect_ctx(mt9m111, &context_b,
@@ -393,8 +393,8 @@ static int mt9m111_s_crop(struct v4l2_subdev *sd, const struct v4l2_crop *a)
         if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                 return -EINVAL;
 
-        if (mt9m111->fmt->code == V4L2_MBUS_FMT_SBGGR8_1X8 ||
-            mt9m111->fmt->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE) {
+        if (mt9m111->fmt->code == MEDIA_BUS_FMT_SBGGR8_1X8 ||
+            mt9m111->fmt->code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE) {
                 /* Bayer format - even size lengths */
                 rect.width      = ALIGN(rect.width, 2);
                 rect.height     = ALIGN(rect.height, 2);
@@ -462,7 +462,7 @@ static int mt9m111_g_fmt(struct v4l2_subdev *sd,
 }
 
 static int mt9m111_set_pixfmt(struct mt9m111 *mt9m111,
-                              enum v4l2_mbus_pixelcode code)
+                              u32 code)
 {
         struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev);
         u16 data_outfmt2, mask_outfmt2 = MT9M111_OUTFMT_PROCESSED_BAYER |
@@ -474,46 +474,46 @@ static int mt9m111_set_pixfmt(struct mt9m111 *mt9m111,
         int ret;
 
         switch (code) {
-        case V4L2_MBUS_FMT_SBGGR8_1X8:
+        case MEDIA_BUS_FMT_SBGGR8_1X8:
                 data_outfmt2 = MT9M111_OUTFMT_PROCESSED_BAYER |
                         MT9M111_OUTFMT_RGB;
                 break;
-        case V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE:
+        case MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE:
                 data_outfmt2 = MT9M111_OUTFMT_BYPASS_IFP | MT9M111_OUTFMT_RGB;
                 break;
-        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE:
+        case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE:
                 data_outfmt2 = MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB555 |
                         MT9M111_OUTFMT_SWAP_YCbCr_C_Y_RGB_EVEN;
                 break;
-        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE:
+        case MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE:
                 data_outfmt2 = MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB555;
                 break;
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 data_outfmt2 = MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB565 |
                         MT9M111_OUTFMT_SWAP_YCbCr_C_Y_RGB_EVEN;
                 break;
-        case V4L2_MBUS_FMT_RGB565_2X8_BE:
+        case MEDIA_BUS_FMT_RGB565_2X8_BE:
                 data_outfmt2 = MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB565;
                 break;
-        case V4L2_MBUS_FMT_BGR565_2X8_BE:
+        case MEDIA_BUS_FMT_BGR565_2X8_BE:
                 data_outfmt2 = MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB565 |
                         MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr_RGB_R_B;
                 break;
-        case V4L2_MBUS_FMT_BGR565_2X8_LE:
+        case MEDIA_BUS_FMT_BGR565_2X8_LE:
                 data_outfmt2 = MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB565 |
                         MT9M111_OUTFMT_SWAP_YCbCr_C_Y_RGB_EVEN |
                         MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr_RGB_R_B;
                 break;
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 data_outfmt2 = 0;
                 break;
-        case V4L2_MBUS_FMT_VYUY8_2X8:
+        case MEDIA_BUS_FMT_VYUY8_2X8:
                 data_outfmt2 = MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr_RGB_R_B;
                 break;
-        case V4L2_MBUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
                 data_outfmt2 = MT9M111_OUTFMT_SWAP_YCbCr_C_Y_RGB_EVEN;
                 break;
-        case V4L2_MBUS_FMT_YVYU8_2X8:
+        case MEDIA_BUS_FMT_YVYU8_2X8:
                 data_outfmt2 = MT9M111_OUTFMT_SWAP_YCbCr_C_Y_RGB_EVEN |
                         MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr_RGB_R_B;
                 break;
@@ -542,8 +542,8 @@ static int mt9m111_try_fmt(struct v4l2_subdev *sd,
 
         fmt = mt9m111_find_datafmt(mt9m111, mf->code);
 
-        bayer = fmt->code == V4L2_MBUS_FMT_SBGGR8_1X8 ||
-                fmt->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE;
+        bayer = fmt->code == MEDIA_BUS_FMT_SBGGR8_1X8 ||
+                fmt->code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE;
 
         /*
          * With Bayer format enforce even side lengths, but let the user play
@@ -554,7 +554,7 @@ static int mt9m111_try_fmt(struct v4l2_subdev *sd,
                 rect->height = ALIGN(rect->height, 2);
         }
 
-        if (fmt->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE) {
+        if (fmt->code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE) {
                 /* IFP bypass mode, no scaling */
                 mf->width = rect->width;
                 mf->height = rect->height;
@@ -840,7 +840,7 @@ static struct v4l2_subdev_core_ops mt9m111_subdev_core_ops = {
 };
 
 static int mt9m111_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                            enum v4l2_mbus_pixelcode *code)
+                            u32 *code)
 {
         if (index >= ARRAY_SIZE(mt9m111_colour_fmts))
                 return -EINVAL;
diff --git a/drivers/media/i2c/soc_camera/mt9t031.c b/drivers/media/i2c/soc_camera/mt9t031.c
index f8358c4071a9..35d9c8d25589 100644
--- a/drivers/media/i2c/soc_camera/mt9t031.c
+++ b/drivers/media/i2c/soc_camera/mt9t031.c
@@ -345,7 +345,7 @@ static int mt9t031_g_fmt(struct v4l2_subdev *sd,
 
         mf->width       = mt9t031->rect.width / mt9t031->xskip;
         mf->height      = mt9t031->rect.height / mt9t031->yskip;
-        mf->code        = V4L2_MBUS_FMT_SBGGR10_1X10;
+        mf->code        = MEDIA_BUS_FMT_SBGGR10_1X10;
         mf->colorspace  = V4L2_COLORSPACE_SRGB;
         mf->field       = V4L2_FIELD_NONE;
 
@@ -367,7 +367,7 @@ static int mt9t031_s_fmt(struct v4l2_subdev *sd,
         xskip = mt9t031_skip(&rect.width, mf->width, MT9T031_MAX_WIDTH);
         yskip = mt9t031_skip(&rect.height, mf->height, MT9T031_MAX_HEIGHT);
 
-        mf->code        = V4L2_MBUS_FMT_SBGGR10_1X10;
+        mf->code        = MEDIA_BUS_FMT_SBGGR10_1X10;
         mf->colorspace  = V4L2_COLORSPACE_SRGB;
 
         /* mt9t031_set_params() doesn't change width and height */
@@ -385,7 +385,7 @@ static int mt9t031_try_fmt(struct v4l2_subdev *sd,
                 &mf->width, MT9T031_MIN_WIDTH, MT9T031_MAX_WIDTH, 1,
                 &mf->height, MT9T031_MIN_HEIGHT, MT9T031_MAX_HEIGHT, 1, 0);
 
-        mf->code        = V4L2_MBUS_FMT_SBGGR10_1X10;
+        mf->code        = MEDIA_BUS_FMT_SBGGR10_1X10;
         mf->colorspace  = V4L2_COLORSPACE_SRGB;
 
         return 0;
@@ -673,12 +673,12 @@ static struct v4l2_subdev_core_ops mt9t031_subdev_core_ops = {
 };
 
 static int mt9t031_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                            enum v4l2_mbus_pixelcode *code)
+                            u32 *code)
 {
         if (index)
                 return -EINVAL;
 
-        *code = V4L2_MBUS_FMT_SBGGR10_1X10;
+        *code = MEDIA_BUS_FMT_SBGGR10_1X10;
         return 0;
 }
 
diff --git a/drivers/media/i2c/soc_camera/mt9t112.c b/drivers/media/i2c/soc_camera/mt9t112.c
index 996d7b4007a5..64f08365e6b2 100644
--- a/drivers/media/i2c/soc_camera/mt9t112.c
+++ b/drivers/media/i2c/soc_camera/mt9t112.c
@@ -77,7 +77,7 @@
                         struct
 ************************************************************************/
 struct mt9t112_format {
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         enum v4l2_colorspace colorspace;
         u16 fmt;
         u16 order;
@@ -103,32 +103,32 @@ struct mt9t112_priv {
 
 static const struct mt9t112_format mt9t112_cfmts[] = {
         {
-                .code           = V4L2_MBUS_FMT_UYVY8_2X8,
+                .code           = MEDIA_BUS_FMT_UYVY8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .fmt            = 1,
                 .order          = 0,
         }, {
-                .code           = V4L2_MBUS_FMT_VYUY8_2X8,
+                .code           = MEDIA_BUS_FMT_VYUY8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .fmt            = 1,
                 .order          = 1,
         }, {
-                .code           = V4L2_MBUS_FMT_YUYV8_2X8,
+                .code           = MEDIA_BUS_FMT_YUYV8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .fmt            = 1,
                 .order          = 2,
         }, {
-                .code           = V4L2_MBUS_FMT_YVYU8_2X8,
+                .code           = MEDIA_BUS_FMT_YVYU8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .fmt            = 1,
                 .order          = 3,
         }, {
-                .code           = V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
+                .code           = MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
                 .fmt            = 8,
                 .order          = 2,
         }, {
-                .code           = V4L2_MBUS_FMT_RGB565_2X8_LE,
+                .code           = MEDIA_BUS_FMT_RGB565_2X8_LE,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
                 .fmt            = 4,
                 .order          = 2,
@@ -840,7 +840,7 @@ static int mt9t112_s_stream(struct v4l2_subdev *sd, int enable)
 
 static int mt9t112_set_params(struct mt9t112_priv *priv,
                               const struct v4l2_rect *rect,
-                              enum v4l2_mbus_pixelcode code)
+                              u32 code)
 {
         int i;
 
@@ -953,7 +953,7 @@ static int mt9t112_try_fmt(struct v4l2_subdev *sd,
                         break;
 
         if (i == priv->num_formats) {
-                mf->code = V4L2_MBUS_FMT_UYVY8_2X8;
+                mf->code = MEDIA_BUS_FMT_UYVY8_2X8;
                 mf->colorspace = V4L2_COLORSPACE_JPEG;
         } else {
                 mf->colorspace  = mt9t112_cfmts[i].colorspace;
@@ -967,7 +967,7 @@ static int mt9t112_try_fmt(struct v4l2_subdev *sd,
 }
 
 static int mt9t112_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9t112_priv *priv = to_mt9t112(client);
@@ -1101,7 +1101,7 @@ static int mt9t112_probe(struct i2c_client *client,
 
         /* Cannot fail: using the default supported pixel code */
         if (!ret)
-                mt9t112_set_params(priv, &rect, V4L2_MBUS_FMT_UYVY8_2X8);
+                mt9t112_set_params(priv, &rect, MEDIA_BUS_FMT_UYVY8_2X8);
         else
                 v4l2_clk_put(priv->clk);
 
diff --git a/drivers/media/i2c/soc_camera/mt9v022.c b/drivers/media/i2c/soc_camera/mt9v022.c
index 99022c8d76eb..a246d4d64b8b 100644
--- a/drivers/media/i2c/soc_camera/mt9v022.c
+++ b/drivers/media/i2c/soc_camera/mt9v022.c
@@ -85,13 +85,13 @@ MODULE_PARM_DESC(sensor_type, "Sensor type: \"colour\" or \"monochrome\"");
 
 /* MT9V022 has only one fixed colorspace per pixelcode */
 struct mt9v022_datafmt {
-        enum v4l2_mbus_pixelcode        code;
+        u32     code;
         enum v4l2_colorspace            colorspace;
 };
 
 /* Find a data format by a pixel code in an array */
 static const struct mt9v022_datafmt *mt9v022_find_datafmt(
-        enum v4l2_mbus_pixelcode code, const struct mt9v022_datafmt *fmt,
+        u32 code, const struct mt9v022_datafmt *fmt,
         int n)
 {
         int i;
@@ -107,14 +107,14 @@ static const struct mt9v022_datafmt mt9v022_colour_fmts[] = {
          * Order important: first natively supported,
          * second supported with a GPIO extender
          */
-        {V4L2_MBUS_FMT_SBGGR10_1X10, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
 };
 
 static const struct mt9v022_datafmt mt9v022_monochrome_fmts[] = {
         /* Order important - see above */
-        {V4L2_MBUS_FMT_Y10_1X10, V4L2_COLORSPACE_JPEG},
-        {V4L2_MBUS_FMT_Y8_1X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_Y10_1X10, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_Y8_1X8, V4L2_COLORSPACE_JPEG},
 };
 
 /* only registers with different addresses on different mt9v02x sensors */
@@ -410,13 +410,13 @@ static int mt9v022_s_fmt(struct v4l2_subdev *sd,
          * .try_mbus_fmt(), datawidth is from our supported format list
          */
         switch (mf->code) {
-        case V4L2_MBUS_FMT_Y8_1X8:
-        case V4L2_MBUS_FMT_Y10_1X10:
+        case MEDIA_BUS_FMT_Y8_1X8:
+        case MEDIA_BUS_FMT_Y10_1X10:
                 if (mt9v022->model != MT9V022IX7ATM)
                         return -EINVAL;
                 break;
-        case V4L2_MBUS_FMT_SBGGR8_1X8:
-        case V4L2_MBUS_FMT_SBGGR10_1X10:
+        case MEDIA_BUS_FMT_SBGGR8_1X8:
+        case MEDIA_BUS_FMT_SBGGR10_1X10:
                 if (mt9v022->model != MT9V022IX7ATC)
                         return -EINVAL;
                 break;
@@ -443,8 +443,8 @@ static int mt9v022_try_fmt(struct v4l2_subdev *sd,
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9v022 *mt9v022 = to_mt9v022(client);
         const struct mt9v022_datafmt *fmt;
-        int align = mf->code == V4L2_MBUS_FMT_SBGGR8_1X8 ||
-                mf->code == V4L2_MBUS_FMT_SBGGR10_1X10;
+        int align = mf->code == MEDIA_BUS_FMT_SBGGR8_1X8 ||
+                mf->code == MEDIA_BUS_FMT_SBGGR10_1X10;
 
         v4l_bound_align_image(&mf->width, MT9V022_MIN_WIDTH,
                 MT9V022_MAX_WIDTH, align,
@@ -759,7 +759,7 @@ static struct v4l2_subdev_core_ops mt9v022_subdev_core_ops = {
 };
 
 static int mt9v022_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                            enum v4l2_mbus_pixelcode *code)
+                            u32 *code)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9v022 *mt9v022 = to_mt9v022(client);
diff --git a/drivers/media/i2c/soc_camera/ov2640.c b/drivers/media/i2c/soc_camera/ov2640.c
index 6c6b1c3b45e3..6f2dd9093d94 100644
--- a/drivers/media/i2c/soc_camera/ov2640.c
+++ b/drivers/media/i2c/soc_camera/ov2640.c
@@ -302,7 +302,7 @@ struct ov2640_win_size {
 struct ov2640_priv {
         struct v4l2_subdev              subdev;
         struct v4l2_ctrl_handler        hdl;
-        enum v4l2_mbus_pixelcode        cfmt_code;
+        u32     cfmt_code;
         struct v4l2_clk                 *clk;
         const struct ov2640_win_size    *win;
 };
@@ -623,11 +623,11 @@ static const struct regval_list ov2640_rgb565_le_regs[] = {
         ENDMARKER,
 };
 
-static enum v4l2_mbus_pixelcode ov2640_codes[] = {
-        V4L2_MBUS_FMT_YUYV8_2X8,
-        V4L2_MBUS_FMT_UYVY8_2X8,
-        V4L2_MBUS_FMT_RGB565_2X8_BE,
-        V4L2_MBUS_FMT_RGB565_2X8_LE,
+static u32 ov2640_codes[] = {
+        MEDIA_BUS_FMT_YUYV8_2X8,
+        MEDIA_BUS_FMT_UYVY8_2X8,
+        MEDIA_BUS_FMT_RGB565_2X8_BE,
+        MEDIA_BUS_FMT_RGB565_2X8_LE,
 };
 
 /*
@@ -785,7 +785,7 @@ static const struct ov2640_win_size *ov2640_select_win(u32 *width, u32 *height)
 }
 
 static int ov2640_set_params(struct i2c_client *client, u32 *width, u32 *height,
-                             enum v4l2_mbus_pixelcode code)
+                             u32 code)
 {
         struct ov2640_priv       *priv = to_ov2640(client);
         const struct regval_list *selected_cfmt_regs;
@@ -797,20 +797,20 @@ static int ov2640_set_params(struct i2c_client *client, u32 *width, u32 *height,
         /* select format */
         priv->cfmt_code = 0;
         switch (code) {
-        case V4L2_MBUS_FMT_RGB565_2X8_BE:
+        case MEDIA_BUS_FMT_RGB565_2X8_BE:
                 dev_dbg(&client->dev, "%s: Selected cfmt RGB565 BE", __func__);
                 selected_cfmt_regs = ov2640_rgb565_be_regs;
                 break;
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 dev_dbg(&client->dev, "%s: Selected cfmt RGB565 LE", __func__);
                 selected_cfmt_regs = ov2640_rgb565_le_regs;
                 break;
-        case V4L2_MBUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
                 dev_dbg(&client->dev, "%s: Selected cfmt YUYV (YUV422)", __func__);
                 selected_cfmt_regs = ov2640_yuyv_regs;
                 break;
         default:
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 dev_dbg(&client->dev, "%s: Selected cfmt UYVY", __func__);
                 selected_cfmt_regs = ov2640_uyvy_regs;
         }
@@ -869,7 +869,7 @@ static int ov2640_g_fmt(struct v4l2_subdev *sd,
         if (!priv->win) {
                 u32 width = W_SVGA, height = H_SVGA;
                 priv->win = ov2640_select_win(&width, &height);
-                priv->cfmt_code = V4L2_MBUS_FMT_UYVY8_2X8;
+                priv->cfmt_code = MEDIA_BUS_FMT_UYVY8_2X8;
         }
 
         mf->width       = priv->win->width;
@@ -877,13 +877,13 @@ static int ov2640_g_fmt(struct v4l2_subdev *sd,
         mf->code        = priv->cfmt_code;
 
         switch (mf->code) {
-        case V4L2_MBUS_FMT_RGB565_2X8_BE:
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_BE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 mf->colorspace = V4L2_COLORSPACE_SRGB;
                 break;
         default:
-        case V4L2_MBUS_FMT_YUYV8_2X8:
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 mf->colorspace = V4L2_COLORSPACE_JPEG;
         }
         mf->field       = V4L2_FIELD_NONE;
@@ -899,14 +899,14 @@ static int ov2640_s_fmt(struct v4l2_subdev *sd,
 
 
         switch (mf->code) {
-        case V4L2_MBUS_FMT_RGB565_2X8_BE:
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_BE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 mf->colorspace = V4L2_COLORSPACE_SRGB;
                 break;
         default:
-                mf->code = V4L2_MBUS_FMT_UYVY8_2X8;
-        case V4L2_MBUS_FMT_YUYV8_2X8:
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+                mf->code = MEDIA_BUS_FMT_UYVY8_2X8;
+        case MEDIA_BUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 mf->colorspace = V4L2_COLORSPACE_JPEG;
         }
 
@@ -926,14 +926,14 @@ static int ov2640_try_fmt(struct v4l2_subdev *sd,
         mf->field       = V4L2_FIELD_NONE;
 
         switch (mf->code) {
-        case V4L2_MBUS_FMT_RGB565_2X8_BE:
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_BE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 mf->colorspace = V4L2_COLORSPACE_SRGB;
                 break;
         default:
-                mf->code = V4L2_MBUS_FMT_UYVY8_2X8;
-        case V4L2_MBUS_FMT_YUYV8_2X8:
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+                mf->code = MEDIA_BUS_FMT_UYVY8_2X8;
+        case MEDIA_BUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 mf->colorspace = V4L2_COLORSPACE_JPEG;
         }
 
@@ -941,7 +941,7 @@ static int ov2640_try_fmt(struct v4l2_subdev *sd,
 }
 
 static int ov2640_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if (index >= ARRAY_SIZE(ov2640_codes))
                 return -EINVAL;
diff --git a/drivers/media/i2c/soc_camera/ov5642.c b/drivers/media/i2c/soc_camera/ov5642.c
index d2daa6a8f272..93ae031bdafb 100644
--- a/drivers/media/i2c/soc_camera/ov5642.c
+++ b/drivers/media/i2c/soc_camera/ov5642.c
@@ -602,7 +602,7 @@ static struct regval_list ov5642_default_regs_finalise[] = {
 };
 
 struct ov5642_datafmt {
-        enum v4l2_mbus_pixelcode        code;
+        u32     code;
         enum v4l2_colorspace            colorspace;
 };
 
@@ -618,7 +618,7 @@ struct ov5642 {
 };
 
 static const struct ov5642_datafmt ov5642_colour_fmts[] = {
-        {V4L2_MBUS_FMT_UYVY8_2X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_UYVY8_2X8, V4L2_COLORSPACE_JPEG},
 };
 
 static struct ov5642 *to_ov5642(const struct i2c_client *client)
@@ -628,7 +628,7 @@ static struct ov5642 *to_ov5642(const struct i2c_client *client)
 
 /* Find a data format by a pixel code in an array */
 static const struct ov5642_datafmt
-                        *ov5642_find_datafmt(enum v4l2_mbus_pixelcode code)
+                        *ov5642_find_datafmt(u32 code)
 {
         int i;
 
@@ -840,7 +840,7 @@ static int ov5642_g_fmt(struct v4l2_subdev *sd,
 }
 
 static int ov5642_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if (index >= ARRAY_SIZE(ov5642_colour_fmts))
                 return -EINVAL;
diff --git a/drivers/media/i2c/soc_camera/ov6650.c b/drivers/media/i2c/soc_camera/ov6650.c
index ab01598ec83f..f4eef2fa6f6f 100644
--- a/drivers/media/i2c/soc_camera/ov6650.c
+++ b/drivers/media/i2c/soc_camera/ov6650.c
@@ -202,18 +202,18 @@ struct ov6650 {
         unsigned long           pclk_limit;     /* from host */
         unsigned long           pclk_max;       /* from resolution and format */
         struct v4l2_fract       tpf;            /* as requested with s_parm */
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         enum v4l2_colorspace    colorspace;
 };
 
 
-static enum v4l2_mbus_pixelcode ov6650_codes[] = {
-        V4L2_MBUS_FMT_YUYV8_2X8,
-        V4L2_MBUS_FMT_UYVY8_2X8,
-        V4L2_MBUS_FMT_YVYU8_2X8,
-        V4L2_MBUS_FMT_VYUY8_2X8,
-        V4L2_MBUS_FMT_SBGGR8_1X8,
-        V4L2_MBUS_FMT_Y8_1X8,
+static u32 ov6650_codes[] = {
+        MEDIA_BUS_FMT_YUYV8_2X8,
+        MEDIA_BUS_FMT_UYVY8_2X8,
+        MEDIA_BUS_FMT_YVYU8_2X8,
+        MEDIA_BUS_FMT_VYUY8_2X8,
+        MEDIA_BUS_FMT_SBGGR8_1X8,
+        MEDIA_BUS_FMT_Y8_1X8,
 };
 
 /* read a register */
@@ -555,29 +555,29 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
                         .height = mf->height << half_scale,
                 },
         };
-        enum v4l2_mbus_pixelcode code = mf->code;
+        u32 code = mf->code;
         unsigned long mclk, pclk;
         u8 coma_set = 0, coma_mask = 0, coml_set, coml_mask, clkrc;
         int ret;
 
         /* select color matrix configuration for given color encoding */
         switch (code) {
-        case V4L2_MBUS_FMT_Y8_1X8:
+        case MEDIA_BUS_FMT_Y8_1X8:
                 dev_dbg(&client->dev, "pixel format GREY8_1X8\n");
                 coma_mask |= COMA_RGB | COMA_WORD_SWAP | COMA_BYTE_SWAP;
                 coma_set |= COMA_BW;
                 break;
-        case V4L2_MBUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
                 dev_dbg(&client->dev, "pixel format YUYV8_2X8_LE\n");
                 coma_mask |= COMA_RGB | COMA_BW | COMA_BYTE_SWAP;
                 coma_set |= COMA_WORD_SWAP;
                 break;
-        case V4L2_MBUS_FMT_YVYU8_2X8:
+        case MEDIA_BUS_FMT_YVYU8_2X8:
                 dev_dbg(&client->dev, "pixel format YVYU8_2X8_LE (untested)\n");
                 coma_mask |= COMA_RGB | COMA_BW | COMA_WORD_SWAP |
                                 COMA_BYTE_SWAP;
                 break;
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 dev_dbg(&client->dev, "pixel format YUYV8_2X8_BE\n");
                 if (half_scale) {
                         coma_mask |= COMA_RGB | COMA_BW | COMA_WORD_SWAP;
@@ -587,7 +587,7 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
                         coma_set |= COMA_BYTE_SWAP | COMA_WORD_SWAP;
                 }
                 break;
-        case V4L2_MBUS_FMT_VYUY8_2X8:
+        case MEDIA_BUS_FMT_VYUY8_2X8:
                 dev_dbg(&client->dev, "pixel format YVYU8_2X8_BE (untested)\n");
                 if (half_scale) {
                         coma_mask |= COMA_RGB | COMA_BW;
@@ -597,7 +597,7 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
                         coma_set |= COMA_BYTE_SWAP;
                 }
                 break;
-        case V4L2_MBUS_FMT_SBGGR8_1X8:
+        case MEDIA_BUS_FMT_SBGGR8_1X8:
                 dev_dbg(&client->dev, "pixel format SBGGR8_1X8 (untested)\n");
                 coma_mask |= COMA_BW | COMA_BYTE_SWAP | COMA_WORD_SWAP;
                 coma_set |= COMA_RAW_RGB | COMA_RGB;
@@ -608,8 +608,8 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
         }
         priv->code = code;
 
-        if (code == V4L2_MBUS_FMT_Y8_1X8 ||
-                        code == V4L2_MBUS_FMT_SBGGR8_1X8) {
+        if (code == MEDIA_BUS_FMT_Y8_1X8 ||
+                        code == MEDIA_BUS_FMT_SBGGR8_1X8) {
                 coml_mask = COML_ONE_CHANNEL;
                 coml_set = 0;
                 priv->pclk_max = 4000000;
@@ -619,7 +619,7 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
                 priv->pclk_max = 8000000;
         }
 
-        if (code == V4L2_MBUS_FMT_SBGGR8_1X8)
+        if (code == MEDIA_BUS_FMT_SBGGR8_1X8)
                 priv->colorspace = V4L2_COLORSPACE_SRGB;
         else if (code != 0)
                 priv->colorspace = V4L2_COLORSPACE_JPEG;
@@ -697,18 +697,18 @@ static int ov6650_try_fmt(struct v4l2_subdev *sd,
         mf->field = V4L2_FIELD_NONE;
 
         switch (mf->code) {
-        case V4L2_MBUS_FMT_Y10_1X10:
-                mf->code = V4L2_MBUS_FMT_Y8_1X8;
-        case V4L2_MBUS_FMT_Y8_1X8:
-        case V4L2_MBUS_FMT_YVYU8_2X8:
-        case V4L2_MBUS_FMT_YUYV8_2X8:
-        case V4L2_MBUS_FMT_VYUY8_2X8:
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_Y10_1X10:
+                mf->code = MEDIA_BUS_FMT_Y8_1X8;
+        case MEDIA_BUS_FMT_Y8_1X8:
+        case MEDIA_BUS_FMT_YVYU8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_VYUY8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 mf->colorspace = V4L2_COLORSPACE_JPEG;
                 break;
         default:
-                mf->code = V4L2_MBUS_FMT_SBGGR8_1X8;
-        case V4L2_MBUS_FMT_SBGGR8_1X8:
+                mf->code = MEDIA_BUS_FMT_SBGGR8_1X8;
+        case MEDIA_BUS_FMT_SBGGR8_1X8:
                 mf->colorspace = V4L2_COLORSPACE_SRGB;
                 break;
         }
@@ -717,7 +717,7 @@ static int ov6650_try_fmt(struct v4l2_subdev *sd,
 }
 
 static int ov6650_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if (index >= ARRAY_SIZE(ov6650_codes))
                 return -EINVAL;
@@ -1013,7 +1013,7 @@ static int ov6650_probe(struct i2c_client *client,
         priv->rect.width  = W_CIF;
         priv->rect.height = H_CIF;
         priv->half_scale  = false;
-        priv->code        = V4L2_MBUS_FMT_YUYV8_2X8;
+        priv->code        = MEDIA_BUS_FMT_YUYV8_2X8;
         priv->colorspace  = V4L2_COLORSPACE_JPEG;
 
         priv->clk = v4l2_clk_get(&client->dev, "mclk");
diff --git a/drivers/media/i2c/soc_camera/ov772x.c b/drivers/media/i2c/soc_camera/ov772x.c
index 970a04e1e56e..8daac88b33fe 100644
--- a/drivers/media/i2c/soc_camera/ov772x.c
+++ b/drivers/media/i2c/soc_camera/ov772x.c
@@ -376,7 +376,7 @@
  */
 
 struct ov772x_color_format {
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         enum v4l2_colorspace colorspace;
         u8 dsp3;
         u8 dsp4;
@@ -408,7 +408,7 @@ struct ov772x_priv {
  */
 static const struct ov772x_color_format ov772x_cfmts[] = {
         {
-                .code           = V4L2_MBUS_FMT_YUYV8_2X8,
+                .code           = MEDIA_BUS_FMT_YUYV8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .dsp3           = 0x0,
                 .dsp4           = DSP_OFMT_YUV,
@@ -416,7 +416,7 @@ static const struct ov772x_color_format ov772x_cfmts[] = {
                 .com7           = OFMT_YUV,
         },
         {
-                .code           = V4L2_MBUS_FMT_YVYU8_2X8,
+                .code           = MEDIA_BUS_FMT_YVYU8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .dsp3           = UV_ON,
                 .dsp4           = DSP_OFMT_YUV,
@@ -424,7 +424,7 @@ static const struct ov772x_color_format ov772x_cfmts[] = {
                 .com7           = OFMT_YUV,
         },
         {
-                .code           = V4L2_MBUS_FMT_UYVY8_2X8,
+                .code           = MEDIA_BUS_FMT_UYVY8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .dsp3           = 0x0,
                 .dsp4           = DSP_OFMT_YUV,
@@ -432,7 +432,7 @@ static const struct ov772x_color_format ov772x_cfmts[] = {
                 .com7           = OFMT_YUV,
         },
         {
-                .code           = V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
+                .code           = MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
                 .dsp3           = 0x0,
                 .dsp4           = DSP_OFMT_YUV,
@@ -440,7 +440,7 @@ static const struct ov772x_color_format ov772x_cfmts[] = {
                 .com7           = FMT_RGB555 | OFMT_RGB,
         },
         {
-                .code           = V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE,
+                .code           = MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
                 .dsp3           = 0x0,
                 .dsp4           = DSP_OFMT_YUV,
@@ -448,7 +448,7 @@ static const struct ov772x_color_format ov772x_cfmts[] = {
                 .com7           = FMT_RGB555 | OFMT_RGB,
         },
         {
-                .code           = V4L2_MBUS_FMT_RGB565_2X8_LE,
+                .code           = MEDIA_BUS_FMT_RGB565_2X8_LE,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
                 .dsp3           = 0x0,
                 .dsp4           = DSP_OFMT_YUV,
@@ -456,7 +456,7 @@ static const struct ov772x_color_format ov772x_cfmts[] = {
                 .com7           = FMT_RGB565 | OFMT_RGB,
         },
         {
-                .code           = V4L2_MBUS_FMT_RGB565_2X8_BE,
+                .code           = MEDIA_BUS_FMT_RGB565_2X8_BE,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
                 .dsp3           = 0x0,
                 .dsp4           = DSP_OFMT_YUV,
@@ -468,7 +468,7 @@ static const struct ov772x_color_format ov772x_cfmts[] = {
                  * regardless of the COM7 value. We can thus only support 10-bit
                  * Bayer until someone figures it out.
                  */
-                .code           = V4L2_MBUS_FMT_SBGGR10_1X10,
+                .code           = MEDIA_BUS_FMT_SBGGR10_1X10,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
                 .dsp3           = 0x0,
                 .dsp4           = DSP_OFMT_RAW10,
@@ -990,7 +990,7 @@ static struct v4l2_subdev_core_ops ov772x_subdev_core_ops = {
 };
 
 static int ov772x_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if (index >= ARRAY_SIZE(ov772x_cfmts))
                 return -EINVAL;
diff --git a/drivers/media/i2c/soc_camera/ov9640.c b/drivers/media/i2c/soc_camera/ov9640.c
index bc74224503e7..aa93d2e88572 100644
--- a/drivers/media/i2c/soc_camera/ov9640.c
+++ b/drivers/media/i2c/soc_camera/ov9640.c
@@ -159,10 +159,10 @@ static const struct ov9640_reg ov9640_regs_rgb[] = {
         { OV9640_MTXS,  0x65 },
 };
 
-static enum v4l2_mbus_pixelcode ov9640_codes[] = {
-        V4L2_MBUS_FMT_UYVY8_2X8,
-        V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
-        V4L2_MBUS_FMT_RGB565_2X8_LE,
+static u32 ov9640_codes[] = {
+        MEDIA_BUS_FMT_UYVY8_2X8,
+        MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,
+        MEDIA_BUS_FMT_RGB565_2X8_LE,
 };
 
 /* read a register */
@@ -351,22 +351,22 @@ static void ov9640_res_roundup(u32 *width, u32 *height)
 }
 
 /* Prepare necessary register changes depending on color encoding */
-static void ov9640_alter_regs(enum v4l2_mbus_pixelcode code,
+static void ov9640_alter_regs(u32 code,
                               struct ov9640_reg_alt *alt)
 {
         switch (code) {
         default:
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 alt->com12      = OV9640_COM12_YUV_AVG;
                 alt->com13      = OV9640_COM13_Y_DELAY_EN |
                                         OV9640_COM13_YUV_DLY(0x01);
                 break;
-        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE:
+        case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE:
                 alt->com7       = OV9640_COM7_RGB;
                 alt->com13      = OV9640_COM13_RGB_AVG;
                 alt->com15      = OV9640_COM15_RGB_555;
                 break;
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 alt->com7       = OV9640_COM7_RGB;
                 alt->com13      = OV9640_COM13_RGB_AVG;
                 alt->com15      = OV9640_COM15_RGB_565;
@@ -376,7 +376,7 @@ static void ov9640_alter_regs(enum v4l2_mbus_pixelcode code,
 
 /* Setup registers according to resolution and color encoding */
 static int ov9640_write_regs(struct i2c_client *client, u32 width,
-                enum v4l2_mbus_pixelcode code, struct ov9640_reg_alt *alts)
+                u32 code, struct ov9640_reg_alt *alts)
 {
         const struct ov9640_reg *ov9640_regs, *matrix_regs;
         int                     ov9640_regs_len, matrix_regs_len;
@@ -419,7 +419,7 @@ static int ov9640_write_regs(struct i2c_client *client, u32 width,
         }
 
         /* select color matrix configuration for given color encoding */
-        if (code == V4L2_MBUS_FMT_UYVY8_2X8) {
+        if (code == MEDIA_BUS_FMT_UYVY8_2X8) {
                 matrix_regs     = ov9640_regs_yuv;
                 matrix_regs_len = ARRAY_SIZE(ov9640_regs_yuv);
         } else {
@@ -487,7 +487,7 @@ static int ov9640_s_fmt(struct v4l2_subdev *sd,
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct ov9640_reg_alt alts = {0};
         enum v4l2_colorspace cspace;
-        enum v4l2_mbus_pixelcode code = mf->code;
+        u32 code = mf->code;
         int ret;
 
         ov9640_res_roundup(&mf->width, &mf->height);
@@ -500,13 +500,13 @@ static int ov9640_s_fmt(struct v4l2_subdev *sd,
                 return ret;
 
         switch (code) {
-        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE:
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 cspace = V4L2_COLORSPACE_SRGB;
                 break;
         default:
-                code = V4L2_MBUS_FMT_UYVY8_2X8;
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+                code = MEDIA_BUS_FMT_UYVY8_2X8;
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 cspace = V4L2_COLORSPACE_JPEG;
         }
 
@@ -527,13 +527,13 @@ static int ov9640_try_fmt(struct v4l2_subdev *sd,
         mf->field = V4L2_FIELD_NONE;
 
         switch (mf->code) {
-        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE:
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 mf->colorspace = V4L2_COLORSPACE_SRGB;
                 break;
         default:
-                mf->code = V4L2_MBUS_FMT_UYVY8_2X8;
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+                mf->code = MEDIA_BUS_FMT_UYVY8_2X8;
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 mf->colorspace = V4L2_COLORSPACE_JPEG;
         }
 
@@ -541,7 +541,7 @@ static int ov9640_try_fmt(struct v4l2_subdev *sd,
 }
 
 static int ov9640_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if (index >= ARRAY_SIZE(ov9640_codes))
                 return -EINVAL;
diff --git a/drivers/media/i2c/soc_camera/ov9740.c b/drivers/media/i2c/soc_camera/ov9740.c
index ee9eb635d540..841dc55457cf 100644
--- a/drivers/media/i2c/soc_camera/ov9740.c
+++ b/drivers/media/i2c/soc_camera/ov9740.c
@@ -392,8 +392,8 @@ static const struct ov9740_reg ov9740_defaults[] = {
         { OV9740_ISP_CTRL19,            0x02 },
 };
 
-static enum v4l2_mbus_pixelcode ov9740_codes[] = {
-        V4L2_MBUS_FMT_YUYV8_2X8,
+static u32 ov9740_codes[] = {
+        MEDIA_BUS_FMT_YUYV8_2X8,
 };
 
 /* read a register */
@@ -674,13 +674,13 @@ static int ov9740_s_fmt(struct v4l2_subdev *sd,
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct ov9740_priv *priv = to_ov9740(sd);
         enum v4l2_colorspace cspace;
-        enum v4l2_mbus_pixelcode code = mf->code;
+        u32 code = mf->code;
         int ret;
 
         ov9740_res_roundup(&mf->width, &mf->height);
 
         switch (code) {
-        case V4L2_MBUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
                 cspace = V4L2_COLORSPACE_SRGB;
                 break;
         default:
@@ -710,14 +710,14 @@ static int ov9740_try_fmt(struct v4l2_subdev *sd,
         ov9740_res_roundup(&mf->width, &mf->height);
 
         mf->field = V4L2_FIELD_NONE;
-        mf->code = V4L2_MBUS_FMT_YUYV8_2X8;
+        mf->code = MEDIA_BUS_FMT_YUYV8_2X8;
         mf->colorspace = V4L2_COLORSPACE_SRGB;
 
         return 0;
 }
 
 static int ov9740_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if (index >= ARRAY_SIZE(ov9740_codes))
                 return -EINVAL;
diff --git a/drivers/media/i2c/soc_camera/rj54n1cb0c.c b/drivers/media/i2c/soc_camera/rj54n1cb0c.c
index 7e6d97847874..1752428c43c5 100644
--- a/drivers/media/i2c/soc_camera/rj54n1cb0c.c
+++ b/drivers/media/i2c/soc_camera/rj54n1cb0c.c
@@ -111,13 +111,13 @@
 
 /* RJ54N1CB0C has only one fixed colorspace per pixelcode */
 struct rj54n1_datafmt {
-        enum v4l2_mbus_pixelcode        code;
+        u32     code;
         enum v4l2_colorspace            colorspace;
 };
 
 /* Find a data format by a pixel code in an array */
 static const struct rj54n1_datafmt *rj54n1_find_datafmt(
-        enum v4l2_mbus_pixelcode code, const struct rj54n1_datafmt *fmt,
+        u32 code, const struct rj54n1_datafmt *fmt,
         int n)
 {
         int i;
@@ -129,15 +129,15 @@ static const struct rj54n1_datafmt *rj54n1_find_datafmt(
 }
 
 static const struct rj54n1_datafmt rj54n1_colour_fmts[] = {
-        {V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG},
-        {V4L2_MBUS_FMT_YVYU8_2X8, V4L2_COLORSPACE_JPEG},
-        {V4L2_MBUS_FMT_RGB565_2X8_LE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_RGB565_2X8_BE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR10_1X10, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_YVYU8_2X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_RGB565_2X8_LE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_RGB565_2X8_BE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_LE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_BE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_BE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_COLORSPACE_SRGB},
 };
 
 struct rj54n1_clock_div {
@@ -486,7 +486,7 @@ static int reg_write_multiple(struct i2c_client *client,
 }
 
 static int rj54n1_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if (index >= ARRAY_SIZE(rj54n1_colour_fmts))
                 return -EINVAL;
@@ -965,11 +965,11 @@ static int rj54n1_try_fmt(struct v4l2_subdev *sd,
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct rj54n1 *rj54n1 = to_rj54n1(client);
         const struct rj54n1_datafmt *fmt;
-        int align = mf->code == V4L2_MBUS_FMT_SBGGR10_1X10 ||
-                mf->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE ||
-                mf->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE ||
-                mf->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE ||
-                mf->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE;
+        int align = mf->code == MEDIA_BUS_FMT_SBGGR10_1X10 ||
+                mf->code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_BE ||
+                mf->code == MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_BE ||
+                mf->code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE ||
+                mf->code == MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_LE;
 
         dev_dbg(&client->dev, "%s: code = %d, width = %u, height = %u\n",
                 __func__, mf->code, mf->width, mf->height);
@@ -1025,55 +1025,55 @@ static int rj54n1_s_fmt(struct v4l2_subdev *sd,
 
         /* RA_SEL_UL is only relevant for raw modes, ignored otherwise. */
         switch (mf->code) {
-        case V4L2_MBUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 0);
                 if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 8, 8);
                 break;
-        case V4L2_MBUS_FMT_YVYU8_2X8:
+        case MEDIA_BUS_FMT_YVYU8_2X8:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 0);
                 if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 0, 8);
                 break;
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 0x11);
                 if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 8, 8);
                 break;
-        case V4L2_MBUS_FMT_RGB565_2X8_BE:
+        case MEDIA_BUS_FMT_RGB565_2X8_BE:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 0x11);
                 if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 0, 8);
                 break;
-        case V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE:
+        case MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_LE:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 4);
                 if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 8, 8);
                 if (!ret)
                         ret = reg_write(client, RJ54N1_RA_SEL_UL, 0);
                 break;
-        case V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE:
+        case MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 4);
                 if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 8, 8);
                 if (!ret)
                         ret = reg_write(client, RJ54N1_RA_SEL_UL, 8);
                 break;
-        case V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE:
+        case MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_BE:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 4);
                 if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 0, 8);
                 if (!ret)
                         ret = reg_write(client, RJ54N1_RA_SEL_UL, 0);
                 break;
-        case V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE:
+        case MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_BE:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 4);
                 if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 0, 8);
                 if (!ret)
                         ret = reg_write(client, RJ54N1_RA_SEL_UL, 8);
                 break;
-        case V4L2_MBUS_FMT_SBGGR10_1X10:
+        case MEDIA_BUS_FMT_SBGGR10_1X10:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 5);
                 break;
         default:
@@ -1083,7 +1083,7 @@ static int rj54n1_s_fmt(struct v4l2_subdev *sd,
         /* Special case: a raw mode with 10 bits of data per clock tick */
         if (!ret)
                 ret = reg_set(client, RJ54N1_OCLK_SEL_EN,
-                              (mf->code == V4L2_MBUS_FMT_SBGGR10_1X10) << 1, 2);
+                              (mf->code == MEDIA_BUS_FMT_SBGGR10_1X10) << 1, 2);
 
         if (ret < 0)
                 return ret;
diff --git a/drivers/media/i2c/soc_camera/tw9910.c b/drivers/media/i2c/soc_camera/tw9910.c
index 416402eb4f82..9b853215d146 100644
--- a/drivers/media/i2c/soc_camera/tw9910.c
+++ b/drivers/media/i2c/soc_camera/tw9910.c
@@ -705,7 +705,7 @@ static int tw9910_g_fmt(struct v4l2_subdev *sd,
 
         mf->width       = priv->scale->width;
         mf->height      = priv->scale->height;
-        mf->code        = V4L2_MBUS_FMT_UYVY8_2X8;
+        mf->code        = MEDIA_BUS_FMT_UYVY8_2X8;
         mf->colorspace  = V4L2_COLORSPACE_JPEG;
         mf->field       = V4L2_FIELD_INTERLACED_BT;
 
@@ -724,7 +724,7 @@ static int tw9910_s_fmt(struct v4l2_subdev *sd,
         /*
          * check color format
          */
-        if (mf->code != V4L2_MBUS_FMT_UYVY8_2X8)
+        if (mf->code != MEDIA_BUS_FMT_UYVY8_2X8)
                 return -EINVAL;
 
         mf->colorspace = V4L2_COLORSPACE_JPEG;
@@ -751,7 +751,7 @@ static int tw9910_try_fmt(struct v4l2_subdev *sd,
                 return -EINVAL;
         }
 
-        mf->code = V4L2_MBUS_FMT_UYVY8_2X8;
+        mf->code = MEDIA_BUS_FMT_UYVY8_2X8;
         mf->colorspace = V4L2_COLORSPACE_JPEG;
 
         /*
@@ -822,12 +822,12 @@ static struct v4l2_subdev_core_ops tw9910_subdev_core_ops = {
 };
 
 static int tw9910_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if (index)
                 return -EINVAL;
 
-        *code = V4L2_MBUS_FMT_UYVY8_2X8;
+        *code = MEDIA_BUS_FMT_UYVY8_2X8;
         return 0;
 }