7 files changed, 175 insertions, 181 deletions

diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c
index 81a9dc053d58..587489a072d5 100644
--- a/drivers/media/platform/omap3isp/ispccdc.c
+++ b/drivers/media/platform/omap3isp/ispccdc.c
@@ -36,23 +36,23 @@ __ccdc_get_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_fh *fh,
                   unsigned int pad, enum v4l2_subdev_format_whence which);
 
 static const unsigned int ccdc_fmts[] = {
-        V4L2_MBUS_FMT_Y8_1X8,
-        V4L2_MBUS_FMT_Y10_1X10,
-        V4L2_MBUS_FMT_Y12_1X12,
-        V4L2_MBUS_FMT_SGRBG8_1X8,
-        V4L2_MBUS_FMT_SRGGB8_1X8,
-        V4L2_MBUS_FMT_SBGGR8_1X8,
-        V4L2_MBUS_FMT_SGBRG8_1X8,
-        V4L2_MBUS_FMT_SGRBG10_1X10,
-        V4L2_MBUS_FMT_SRGGB10_1X10,
-        V4L2_MBUS_FMT_SBGGR10_1X10,
-        V4L2_MBUS_FMT_SGBRG10_1X10,
-        V4L2_MBUS_FMT_SGRBG12_1X12,
-        V4L2_MBUS_FMT_SRGGB12_1X12,
-        V4L2_MBUS_FMT_SBGGR12_1X12,
-        V4L2_MBUS_FMT_SGBRG12_1X12,
-        V4L2_MBUS_FMT_YUYV8_2X8,
-        V4L2_MBUS_FMT_UYVY8_2X8,
+        MEDIA_BUS_FMT_Y8_1X8,
+        MEDIA_BUS_FMT_Y10_1X10,
+        MEDIA_BUS_FMT_Y12_1X12,
+        MEDIA_BUS_FMT_SGRBG8_1X8,
+        MEDIA_BUS_FMT_SRGGB8_1X8,
+        MEDIA_BUS_FMT_SBGGR8_1X8,
+        MEDIA_BUS_FMT_SGBRG8_1X8,
+        MEDIA_BUS_FMT_SGRBG10_1X10,
+        MEDIA_BUS_FMT_SRGGB10_1X10,
+        MEDIA_BUS_FMT_SBGGR10_1X10,
+        MEDIA_BUS_FMT_SGBRG10_1X10,
+        MEDIA_BUS_FMT_SGRBG12_1X12,
+        MEDIA_BUS_FMT_SRGGB12_1X12,
+        MEDIA_BUS_FMT_SBGGR12_1X12,
+        MEDIA_BUS_FMT_SGBRG12_1X12,
+        MEDIA_BUS_FMT_YUYV8_2X8,
+        MEDIA_BUS_FMT_UYVY8_2X8,
 };
 
 /*
@@ -266,10 +266,10 @@ static int __ccdc_lsc_enable(struct isp_ccdc_device *ccdc, int enable)
                 __ccdc_get_format(ccdc, NULL, CCDC_PAD_SINK,
                                   V4L2_SUBDEV_FORMAT_ACTIVE);
 
-        if ((format->code != V4L2_MBUS_FMT_SGRBG10_1X10) &&
-            (format->code != V4L2_MBUS_FMT_SRGGB10_1X10) &&
-            (format->code != V4L2_MBUS_FMT_SBGGR10_1X10) &&
-            (format->code != V4L2_MBUS_FMT_SGBRG10_1X10))
+        if ((format->code != MEDIA_BUS_FMT_SGRBG10_1X10) &&
+            (format->code != MEDIA_BUS_FMT_SRGGB10_1X10) &&
+            (format->code != MEDIA_BUS_FMT_SBGGR10_1X10) &&
+            (format->code != MEDIA_BUS_FMT_SGBRG10_1X10))
                 return -EINVAL;
 
         if (enable)
@@ -971,8 +971,8 @@ static void ccdc_config_sync_if(struct isp_ccdc_device *ccdc,
 
         format = &ccdc->formats[CCDC_PAD_SINK];
 
-        if (format->code == V4L2_MBUS_FMT_YUYV8_2X8 ||
-            format->code == V4L2_MBUS_FMT_UYVY8_2X8) {
+        if (format->code == MEDIA_BUS_FMT_YUYV8_2X8 ||
+            format->code == MEDIA_BUS_FMT_UYVY8_2X8) {
                 /* According to the OMAP3 TRM the input mode only affects SYNC
                  * mode, enabling BT.656 mode should take precedence. However,
                  * in practice setting the input mode to YCbCr data on 8 bits
@@ -1020,7 +1020,7 @@ static void ccdc_config_sync_if(struct isp_ccdc_device *ccdc,
         /* The CCDC_CFG.Y8POS bit is used in YCbCr8 input mode only. The
          * hardware seems to ignore it in all other input modes.
          */
-        if (format->code == V4L2_MBUS_FMT_UYVY8_2X8)
+        if (format->code == MEDIA_BUS_FMT_UYVY8_2X8)
                 isp_reg_set(isp, OMAP3_ISP_IOMEM_CCDC, ISPCCDC_CFG,
                             ISPCCDC_CFG_Y8POS);
         else
@@ -1168,9 +1168,9 @@ static void ccdc_configure(struct isp_ccdc_device *ccdc)
 
         if (ccdc->bt656)
                 bridge = ISPCTRL_PAR_BRIDGE_DISABLE;
-        else if (fmt_info->code == V4L2_MBUS_FMT_YUYV8_2X8)
+        else if (fmt_info->code == MEDIA_BUS_FMT_YUYV8_2X8)
                 bridge = ISPCTRL_PAR_BRIDGE_LENDIAN;
-        else if (fmt_info->code == V4L2_MBUS_FMT_UYVY8_2X8)
+        else if (fmt_info->code == MEDIA_BUS_FMT_UYVY8_2X8)
                 bridge = ISPCTRL_PAR_BRIDGE_BENDIAN;
         else
                 bridge = ISPCTRL_PAR_BRIDGE_DISABLE;
@@ -1199,16 +1199,16 @@ static void ccdc_configure(struct isp_ccdc_device *ccdc)
 
         /* Mosaic filter */
         switch (format->code) {
-        case V4L2_MBUS_FMT_SRGGB10_1X10:
-        case V4L2_MBUS_FMT_SRGGB12_1X12:
+        case MEDIA_BUS_FMT_SRGGB10_1X10:
+        case MEDIA_BUS_FMT_SRGGB12_1X12:
                 ccdc_pattern = ccdc_srggb_pattern;
                 break;
-        case V4L2_MBUS_FMT_SBGGR10_1X10:
-        case V4L2_MBUS_FMT_SBGGR12_1X12:
+        case MEDIA_BUS_FMT_SBGGR10_1X10:
+        case MEDIA_BUS_FMT_SBGGR12_1X12:
                 ccdc_pattern = ccdc_sbggr_pattern;
                 break;
-        case V4L2_MBUS_FMT_SGBRG10_1X10:
-        case V4L2_MBUS_FMT_SGBRG12_1X12:
+        case MEDIA_BUS_FMT_SGBRG10_1X10:
+        case MEDIA_BUS_FMT_SGBRG12_1X12:
                 ccdc_pattern = ccdc_sgbrg_pattern;
                 break;
         default:
@@ -1267,7 +1267,7 @@ static void ccdc_configure(struct isp_ccdc_device *ccdc)
         /* The CCDC outputs data in UYVY order by default. Swap bytes to get
          * YUYV.
          */
-        if (format->code == V4L2_MBUS_FMT_YUYV8_1X16)
+        if (format->code == MEDIA_BUS_FMT_YUYV8_1X16)
                 isp_reg_set(isp, OMAP3_ISP_IOMEM_CCDC, ISPCCDC_CFG,
                             ISPCCDC_CFG_BSWD);
         else
@@ -1967,7 +1967,7 @@ ccdc_try_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_fh *fh,
                 enum v4l2_subdev_format_whence which)
 {
         const struct isp_format_info *info;
-        enum v4l2_mbus_pixelcode pixelcode;
+        u32 pixelcode;
         unsigned int width = fmt->width;
         unsigned int height = fmt->height;
         struct v4l2_rect *crop;
@@ -1983,7 +1983,7 @@ ccdc_try_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_fh *fh,
 
                 /* If not found, use SGRBG10 as default */
                 if (i >= ARRAY_SIZE(ccdc_fmts))
-                        fmt->code = V4L2_MBUS_FMT_SGRBG10_1X10;
+                        fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
 
                 /* Clamp the input size. */
                 fmt->width = clamp_t(u32, width, 32, 4096);
@@ -2007,19 +2007,19 @@ ccdc_try_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_fh *fh,
                  * configured to pack bytes in BT.656, hiding the inaccuracy.
                  * In all cases bytes can be swapped.
                  */
-                if (fmt->code == V4L2_MBUS_FMT_YUYV8_2X8 ||
-                    fmt->code == V4L2_MBUS_FMT_UYVY8_2X8) {
+                if (fmt->code == MEDIA_BUS_FMT_YUYV8_2X8 ||
+                    fmt->code == MEDIA_BUS_FMT_UYVY8_2X8) {
                         /* Use the user requested format if YUV. */
-                        if (pixelcode == V4L2_MBUS_FMT_YUYV8_2X8 ||
-                            pixelcode == V4L2_MBUS_FMT_UYVY8_2X8 ||
-                            pixelcode == V4L2_MBUS_FMT_YUYV8_1X16 ||
-                            pixelcode == V4L2_MBUS_FMT_UYVY8_1X16)
+                        if (pixelcode == MEDIA_BUS_FMT_YUYV8_2X8 ||
+                            pixelcode == MEDIA_BUS_FMT_UYVY8_2X8 ||
+                            pixelcode == MEDIA_BUS_FMT_YUYV8_1X16 ||
+                            pixelcode == MEDIA_BUS_FMT_UYVY8_1X16)
                                 fmt->code = pixelcode;
 
-                        if (fmt->code == V4L2_MBUS_FMT_YUYV8_2X8)
-                                fmt->code = V4L2_MBUS_FMT_YUYV8_1X16;
-                        else if (fmt->code == V4L2_MBUS_FMT_UYVY8_2X8)
-                                fmt->code = V4L2_MBUS_FMT_UYVY8_1X16;
+                        if (fmt->code == MEDIA_BUS_FMT_YUYV8_2X8)
+                                fmt->code = MEDIA_BUS_FMT_YUYV8_1X16;
+                        else if (fmt->code == MEDIA_BUS_FMT_UYVY8_2X8)
+                                fmt->code = MEDIA_BUS_FMT_UYVY8_1X16;
                 }
 
                 /* Hardcode the output size to the crop rectangle size. */
@@ -2047,8 +2047,8 @@ ccdc_try_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_fh *fh,
                 fmt->code = info->truncated;
 
                 /* YUV formats are not supported by the video port. */
-                if (fmt->code == V4L2_MBUS_FMT_YUYV8_2X8 ||
-                    fmt->code == V4L2_MBUS_FMT_UYVY8_2X8)
+                if (fmt->code == MEDIA_BUS_FMT_YUYV8_2X8 ||
+                    fmt->code == MEDIA_BUS_FMT_UYVY8_2X8)
                         fmt->code = 0;
 
                 /* The number of lines that can be clocked out from the video
@@ -2083,7 +2083,7 @@ static void ccdc_try_crop(struct isp_ccdc_device *ccdc,
          * to keep the Bayer pattern.
          */
         info = omap3isp_video_format_info(sink->code);
-        if (info->flavor != V4L2_MBUS_FMT_Y8_1X8) {
+        if (info->flavor != MEDIA_BUS_FMT_Y8_1X8) {
                 crop->left &= ~1;
                 crop->top &= ~1;
         }
@@ -2103,7 +2103,7 @@ static void ccdc_try_crop(struct isp_ccdc_device *ccdc,
                                sink->height - crop->top);
 
         /* Odd width/height values don't make sense for Bayer formats. */
-        if (info->flavor != V4L2_MBUS_FMT_Y8_1X8) {
+        if (info->flavor != MEDIA_BUS_FMT_Y8_1X8) {
                 crop->width &= ~1;
                 crop->height &= ~1;
         }
@@ -2135,13 +2135,13 @@ static int ccdc_enum_mbus_code(struct v4l2_subdev *sd,
                 format = __ccdc_get_format(ccdc, fh, code->pad,
                                            V4L2_SUBDEV_FORMAT_TRY);
 
-                if (format->code == V4L2_MBUS_FMT_YUYV8_2X8 ||
-                    format->code == V4L2_MBUS_FMT_UYVY8_2X8) {
+                if (format->code == MEDIA_BUS_FMT_YUYV8_2X8 ||
+                    format->code == MEDIA_BUS_FMT_UYVY8_2X8) {
                         /* In YUV mode the CCDC can swap bytes. */
                         if (code->index == 0)
-                                code->code = V4L2_MBUS_FMT_YUYV8_1X16;
+                                code->code = MEDIA_BUS_FMT_YUYV8_1X16;
                         else if (code->index == 1)
-                                code->code = V4L2_MBUS_FMT_UYVY8_1X16;
+                                code->code = MEDIA_BUS_FMT_UYVY8_1X16;
                         else
                                 return -EINVAL;
                 } else {
@@ -2383,9 +2383,7 @@ static int ccdc_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
  * return true if the combination is possible
  * return false otherwise
  */
-static bool ccdc_is_shiftable(enum v4l2_mbus_pixelcode in,
-                              enum v4l2_mbus_pixelcode out,
-                              unsigned int additional_shift)
+static bool ccdc_is_shiftable(u32 in, u32 out, unsigned int additional_shift)
 {
         const struct isp_format_info *in_info, *out_info;
 
@@ -2452,7 +2450,7 @@ static int ccdc_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
         memset(&format, 0, sizeof(format));
         format.pad = CCDC_PAD_SINK;
         format.which = fh ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;
-        format.format.code = V4L2_MBUS_FMT_SGRBG10_1X10;
+        format.format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
         format.format.width = 4096;
         format.format.height = 4096;
         ccdc_set_format(sd, fh, &format);
diff --git a/drivers/media/platform/omap3isp/ispccp2.c b/drivers/media/platform/omap3isp/ispccp2.c
index 9cb49b3c04bd..f4aedb37e41e 100644
--- a/drivers/media/platform/omap3isp/ispccp2.c
+++ b/drivers/media/platform/omap3isp/ispccp2.c
@@ -289,10 +289,10 @@ static void ccp2_lcx_config(struct isp_ccp2_device *ccp2,
         u32 val, format;
 
         switch (config->format) {
-        case V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8:
+        case MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8:
                 format = ISPCCP2_LCx_CTRL_FORMAT_RAW8_DPCM10_VP;
                 break;
-        case V4L2_MBUS_FMT_SGRBG10_1X10:
+        case MEDIA_BUS_FMT_SGRBG10_1X10:
         default:
                 format = ISPCCP2_LCx_CTRL_FORMAT_RAW10_VP;      /* RAW10+VP */
                 break;
@@ -438,7 +438,7 @@ static void ccp2_mem_configure(struct isp_ccp2_device *ccp2,
         u32 val, hwords;
 
         if (sink_pixcode != source_pixcode &&
-            sink_pixcode == V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8)
+            sink_pixcode == MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8)
                 dpcm_decompress = 1;
 
         ccp2_pwr_cfg(ccp2);
@@ -604,8 +604,8 @@ void omap3isp_ccp2_isr(struct isp_ccp2_device *ccp2)
  */
 
 static const unsigned int ccp2_fmts[] = {
-        V4L2_MBUS_FMT_SGRBG10_1X10,
-        V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8,
+        MEDIA_BUS_FMT_SGRBG10_1X10,
+        MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8,
 };
 
 /*
@@ -643,8 +643,8 @@ static void ccp2_try_format(struct isp_ccp2_device *ccp2,
 
         switch (pad) {
         case CCP2_PAD_SINK:
-                if (fmt->code != V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8)
-                        fmt->code = V4L2_MBUS_FMT_SGRBG10_1X10;
+                if (fmt->code != MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8)
+                        fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
 
                 if (ccp2->input == CCP2_INPUT_SENSOR) {
                         fmt->width = clamp_t(u32, fmt->width,
@@ -671,7 +671,7 @@ static void ccp2_try_format(struct isp_ccp2_device *ccp2,
                  */
                 format = __ccp2_get_format(ccp2, fh, CCP2_PAD_SINK, which);
                 memcpy(fmt, format, sizeof(*fmt));
-                fmt->code = V4L2_MBUS_FMT_SGRBG10_1X10;
+                fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
                 break;
         }
 
@@ -808,7 +808,7 @@ static int ccp2_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
         memset(&format, 0, sizeof(format));
         format.pad = CCP2_PAD_SINK;
         format.which = fh ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;
-        format.format.code = V4L2_MBUS_FMT_SGRBG10_1X10;
+        format.format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
         format.format.width = 4096;
         format.format.height = 4096;
         ccp2_set_format(sd, fh, &format);
diff --git a/drivers/media/platform/omap3isp/ispcsi2.c b/drivers/media/platform/omap3isp/ispcsi2.c
index 6530b255f103..09c686d96ae8 100644
--- a/drivers/media/platform/omap3isp/ispcsi2.c
+++ b/drivers/media/platform/omap3isp/ispcsi2.c
@@ -78,15 +78,15 @@ static void csi2_recv_config(struct isp_device *isp,
 }
 
 static const unsigned int csi2_input_fmts[] = {
-        V4L2_MBUS_FMT_SGRBG10_1X10,
-        V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8,
-        V4L2_MBUS_FMT_SRGGB10_1X10,
-        V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8,
-        V4L2_MBUS_FMT_SBGGR10_1X10,
-        V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8,
-        V4L2_MBUS_FMT_SGBRG10_1X10,
-        V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8,
-        V4L2_MBUS_FMT_YUYV8_2X8,
+        MEDIA_BUS_FMT_SGRBG10_1X10,
+        MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8,
+        MEDIA_BUS_FMT_SRGGB10_1X10,
+        MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8,
+        MEDIA_BUS_FMT_SBGGR10_1X10,
+        MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8,
+        MEDIA_BUS_FMT_SGBRG10_1X10,
+        MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8,
+        MEDIA_BUS_FMT_YUYV8_2X8,
 };
 
 /* To set the format on the CSI2 requires a mapping function that takes
@@ -171,19 +171,19 @@ static u16 csi2_ctx_map_format(struct isp_csi2_device *csi2)
         int fmtidx, destidx, is_3630;
 
         switch (fmt->code) {
-        case V4L2_MBUS_FMT_SGRBG10_1X10:
-        case V4L2_MBUS_FMT_SRGGB10_1X10:
-        case V4L2_MBUS_FMT_SBGGR10_1X10:
-        case V4L2_MBUS_FMT_SGBRG10_1X10:
+        case MEDIA_BUS_FMT_SGRBG10_1X10:
+        case MEDIA_BUS_FMT_SRGGB10_1X10:
+        case MEDIA_BUS_FMT_SBGGR10_1X10:
+        case MEDIA_BUS_FMT_SGBRG10_1X10:
                 fmtidx = 0;
                 break;
-        case V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8:
-        case V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8:
-        case V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8:
-        case V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8:
+        case MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8:
+        case MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8:
+        case MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8:
+        case MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8:
                 fmtidx = 1;
                 break;
-        case V4L2_MBUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
                 fmtidx = 2;
                 break;
         default:
@@ -843,7 +843,7 @@ csi2_try_format(struct isp_csi2_device *csi2, struct v4l2_subdev_fh *fh,
                 unsigned int pad, struct v4l2_mbus_framefmt *fmt,
                 enum v4l2_subdev_format_whence which)
 {
-        enum v4l2_mbus_pixelcode pixelcode;
+        u32 pixelcode;
         struct v4l2_mbus_framefmt *format;
         const struct isp_format_info *info;
         unsigned int i;
@@ -858,7 +858,7 @@ csi2_try_format(struct isp_csi2_device *csi2, struct v4l2_subdev_fh *fh,
 
                 /* If not found, use SGRBG10 as default */
                 if (i >= ARRAY_SIZE(csi2_input_fmts))
-                        fmt->code = V4L2_MBUS_FMT_SGRBG10_1X10;
+                        fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
 
                 fmt->width = clamp_t(u32, fmt->width, 1, 8191);
                 fmt->height = clamp_t(u32, fmt->height, 1, 8191);
@@ -1029,7 +1029,7 @@ static int csi2_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
         memset(&format, 0, sizeof(format));
         format.pad = CSI2_PAD_SINK;
         format.which = fh ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;
-        format.format.code = V4L2_MBUS_FMT_SGRBG10_1X10;
+        format.format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
         format.format.width = 4096;
         format.format.height = 4096;
         csi2_set_format(sd, fh, &format);
diff --git a/drivers/media/platform/omap3isp/isppreview.c b/drivers/media/platform/omap3isp/isppreview.c
index 605f57ef0a49..dd9eed45d853 100644
--- a/drivers/media/platform/omap3isp/isppreview.c
+++ b/drivers/media/platform/omap3isp/isppreview.c
@@ -964,18 +964,16 @@ static void preview_setup_hw(struct isp_prev_device *prev, u32 update,
  * @prev: pointer to previewer private structure
  * @pixelcode: pixel code
  */
-static void
-preview_config_ycpos(struct isp_prev_device *prev,
-                     enum v4l2_mbus_pixelcode pixelcode)
+static void preview_config_ycpos(struct isp_prev_device *prev, u32 pixelcode)
 {
         struct isp_device *isp = to_isp_device(prev);
         enum preview_ycpos_mode mode;
 
         switch (pixelcode) {
-        case V4L2_MBUS_FMT_YUYV8_1X16:
+        case MEDIA_BUS_FMT_YUYV8_1X16:
                 mode = YCPOS_CrYCbY;
                 break;
-        case V4L2_MBUS_FMT_UYVY8_1X16:
+        case MEDIA_BUS_FMT_UYVY8_1X16:
                 mode = YCPOS_YCrYCb;
                 break;
         default:
@@ -1028,16 +1026,16 @@ static void preview_config_input_format(struct isp_prev_device *prev,
                             ISPPRV_PCR_WIDTH);
 
         switch (info->flavor) {
-        case V4L2_MBUS_FMT_SGRBG8_1X8:
+        case MEDIA_BUS_FMT_SGRBG8_1X8:
                 prev->params.cfa_order = 0;
                 break;
-        case V4L2_MBUS_FMT_SRGGB8_1X8:
+        case MEDIA_BUS_FMT_SRGGB8_1X8:
                 prev->params.cfa_order = 1;
                 break;
-        case V4L2_MBUS_FMT_SBGGR8_1X8:
+        case MEDIA_BUS_FMT_SBGGR8_1X8:
                 prev->params.cfa_order = 2;
                 break;
-        case V4L2_MBUS_FMT_SGBRG8_1X8:
+        case MEDIA_BUS_FMT_SGBRG8_1X8:
                 prev->params.cfa_order = 3;
                 break;
         default:
@@ -1078,8 +1076,8 @@ static void preview_config_input_size(struct isp_prev_device *prev, u32 active)
         unsigned int elv = prev->crop.top + prev->crop.height - 1;
         u32 features;
 
-        if (format->code != V4L2_MBUS_FMT_Y8_1X8 &&
-            format->code != V4L2_MBUS_FMT_Y10_1X10) {
+        if (format->code != MEDIA_BUS_FMT_Y8_1X8 &&
+            format->code != MEDIA_BUS_FMT_Y10_1X10) {
                 sph -= 2;
                 eph += 2;
                 slv -= 2;
@@ -1709,21 +1707,21 @@ __preview_get_crop(struct isp_prev_device *prev, struct v4l2_subdev_fh *fh,
 
 /* previewer format descriptions */
 static const unsigned int preview_input_fmts[] = {
-        V4L2_MBUS_FMT_Y8_1X8,
-        V4L2_MBUS_FMT_SGRBG8_1X8,
-        V4L2_MBUS_FMT_SRGGB8_1X8,
-        V4L2_MBUS_FMT_SBGGR8_1X8,
-        V4L2_MBUS_FMT_SGBRG8_1X8,
-        V4L2_MBUS_FMT_Y10_1X10,
-        V4L2_MBUS_FMT_SGRBG10_1X10,
-        V4L2_MBUS_FMT_SRGGB10_1X10,
-        V4L2_MBUS_FMT_SBGGR10_1X10,
-        V4L2_MBUS_FMT_SGBRG10_1X10,
+        MEDIA_BUS_FMT_Y8_1X8,
+        MEDIA_BUS_FMT_SGRBG8_1X8,
+        MEDIA_BUS_FMT_SRGGB8_1X8,
+        MEDIA_BUS_FMT_SBGGR8_1X8,
+        MEDIA_BUS_FMT_SGBRG8_1X8,
+        MEDIA_BUS_FMT_Y10_1X10,
+        MEDIA_BUS_FMT_SGRBG10_1X10,
+        MEDIA_BUS_FMT_SRGGB10_1X10,
+        MEDIA_BUS_FMT_SBGGR10_1X10,
+        MEDIA_BUS_FMT_SGBRG10_1X10,
 };
 
 static const unsigned int preview_output_fmts[] = {
-        V4L2_MBUS_FMT_UYVY8_1X16,
-        V4L2_MBUS_FMT_YUYV8_1X16,
+        MEDIA_BUS_FMT_UYVY8_1X16,
+        MEDIA_BUS_FMT_YUYV8_1X16,
 };
 
 /*
@@ -1742,7 +1740,7 @@ static void preview_try_format(struct isp_prev_device *prev,
                                struct v4l2_mbus_framefmt *fmt,
                                enum v4l2_subdev_format_whence which)
 {
-        enum v4l2_mbus_pixelcode pixelcode;
+        u32 pixelcode;
         struct v4l2_rect *crop;
         unsigned int i;
 
@@ -1774,7 +1772,7 @@ static void preview_try_format(struct isp_prev_device *prev,
 
                 /* If not found, use SGRBG10 as default */
                 if (i >= ARRAY_SIZE(preview_input_fmts))
-                        fmt->code = V4L2_MBUS_FMT_SGRBG10_1X10;
+                        fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
                 break;
 
         case PREV_PAD_SOURCE:
@@ -1782,13 +1780,13 @@ static void preview_try_format(struct isp_prev_device *prev,
                 *fmt = *__preview_get_format(prev, fh, PREV_PAD_SINK, which);
 
                 switch (pixelcode) {
-                case V4L2_MBUS_FMT_YUYV8_1X16:
-                case V4L2_MBUS_FMT_UYVY8_1X16:
+                case MEDIA_BUS_FMT_YUYV8_1X16:
+                case MEDIA_BUS_FMT_UYVY8_1X16:
                         fmt->code = pixelcode;
                         break;
 
                 default:
-                        fmt->code = V4L2_MBUS_FMT_YUYV8_1X16;
+                        fmt->code = MEDIA_BUS_FMT_YUYV8_1X16;
                         break;
                 }
 
@@ -1843,8 +1841,8 @@ static void preview_try_crop(struct isp_prev_device *prev,
          * and no columns in other modes. Increase the margins based on the sink
          * format.
          */
-        if (sink->code != V4L2_MBUS_FMT_Y8_1X8 &&
-            sink->code != V4L2_MBUS_FMT_Y10_1X10) {
+        if (sink->code != MEDIA_BUS_FMT_Y8_1X8 &&
+            sink->code != MEDIA_BUS_FMT_Y10_1X10) {
                 left += 2;
                 right -= 2;
                 top += 2;
@@ -2092,7 +2090,7 @@ static int preview_init_formats(struct v4l2_subdev *sd,
         memset(&format, 0, sizeof(format));
         format.pad = PREV_PAD_SINK;
         format.which = fh ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;
-        format.format.code = V4L2_MBUS_FMT_SGRBG10_1X10;
+        format.format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
         format.format.width = 4096;
         format.format.height = 4096;
         preview_set_format(sd, fh, &format);
diff --git a/drivers/media/platform/omap3isp/ispresizer.c b/drivers/media/platform/omap3isp/ispresizer.c
index 05d1ace57451..2b9bc4839876 100644
--- a/drivers/media/platform/omap3isp/ispresizer.c
+++ b/drivers/media/platform/omap3isp/ispresizer.c
@@ -198,17 +198,16 @@ static void resizer_set_bilinear(struct isp_res_device *res,
  * @res: Device context.
  * @pixelcode: pixel code.
  */
-static void resizer_set_ycpos(struct isp_res_device *res,
-                              enum v4l2_mbus_pixelcode pixelcode)
+static void resizer_set_ycpos(struct isp_res_device *res, u32 pixelcode)
 {
         struct isp_device *isp = to_isp_device(res);
 
         switch (pixelcode) {
-        case V4L2_MBUS_FMT_YUYV8_1X16:
+        case MEDIA_BUS_FMT_YUYV8_1X16:
                 isp_reg_set(isp, OMAP3_ISP_IOMEM_RESZ, ISPRSZ_CNT,
                             ISPRSZ_CNT_YCPOS);
                 break;
-        case V4L2_MBUS_FMT_UYVY8_1X16:
+        case MEDIA_BUS_FMT_UYVY8_1X16:
                 isp_reg_clr(isp, OMAP3_ISP_IOMEM_RESZ, ISPRSZ_CNT,
                             ISPRSZ_CNT_YCPOS);
                 break;
@@ -1348,8 +1347,8 @@ static int resizer_set_selection(struct v4l2_subdev *sd,
 
 /* resizer pixel formats */
 static const unsigned int resizer_formats[] = {
-        V4L2_MBUS_FMT_UYVY8_1X16,
-        V4L2_MBUS_FMT_YUYV8_1X16,
+        MEDIA_BUS_FMT_UYVY8_1X16,
+        MEDIA_BUS_FMT_YUYV8_1X16,
 };
 
 static unsigned int resizer_max_in_width(struct isp_res_device *res)
@@ -1385,9 +1384,9 @@ static void resizer_try_format(struct isp_res_device *res,
 
         switch (pad) {
         case RESZ_PAD_SINK:
-                if (fmt->code != V4L2_MBUS_FMT_YUYV8_1X16 &&
-                    fmt->code != V4L2_MBUS_FMT_UYVY8_1X16)
-                        fmt->code = V4L2_MBUS_FMT_YUYV8_1X16;
+                if (fmt->code != MEDIA_BUS_FMT_YUYV8_1X16 &&
+                    fmt->code != MEDIA_BUS_FMT_UYVY8_1X16)
+                        fmt->code = MEDIA_BUS_FMT_YUYV8_1X16;
 
                 fmt->width = clamp_t(u32, fmt->width, MIN_IN_WIDTH,
                                      resizer_max_in_width(res));
@@ -1571,7 +1570,7 @@ static int resizer_init_formats(struct v4l2_subdev *sd,
         memset(&format, 0, sizeof(format));
         format.pad = RESZ_PAD_SINK;
         format.which = fh ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;
-        format.format.code = V4L2_MBUS_FMT_YUYV8_1X16;
+        format.format.code = MEDIA_BUS_FMT_YUYV8_1X16;
         format.format.width = 4096;
         format.format.height = 4096;
         resizer_set_format(sd, fh, &format);
diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index bc38c88c7bd9..b463fe172d16 100644
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -39,74 +39,74 @@
  * corresponding in-memory formats to the table below!!!
  */
 static struct isp_format_info formats[] = {
-        { V4L2_MBUS_FMT_Y8_1X8, V4L2_MBUS_FMT_Y8_1X8,
-          V4L2_MBUS_FMT_Y8_1X8, V4L2_MBUS_FMT_Y8_1X8,
+        { MEDIA_BUS_FMT_Y8_1X8, MEDIA_BUS_FMT_Y8_1X8,
+          MEDIA_BUS_FMT_Y8_1X8, MEDIA_BUS_FMT_Y8_1X8,
           V4L2_PIX_FMT_GREY, 8, 1, },
-        { V4L2_MBUS_FMT_Y10_1X10, V4L2_MBUS_FMT_Y10_1X10,
-          V4L2_MBUS_FMT_Y10_1X10, V4L2_MBUS_FMT_Y8_1X8,
+        { MEDIA_BUS_FMT_Y10_1X10, MEDIA_BUS_FMT_Y10_1X10,
+          MEDIA_BUS_FMT_Y10_1X10, MEDIA_BUS_FMT_Y8_1X8,
           V4L2_PIX_FMT_Y10, 10, 2, },
-        { V4L2_MBUS_FMT_Y12_1X12, V4L2_MBUS_FMT_Y10_1X10,
-          V4L2_MBUS_FMT_Y12_1X12, V4L2_MBUS_FMT_Y8_1X8,
+        { MEDIA_BUS_FMT_Y12_1X12, MEDIA_BUS_FMT_Y10_1X10,
+          MEDIA_BUS_FMT_Y12_1X12, MEDIA_BUS_FMT_Y8_1X8,
           V4L2_PIX_FMT_Y12, 12, 2, },
-        { V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_MBUS_FMT_SBGGR8_1X8,
-          V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_MBUS_FMT_SBGGR8_1X8,
+        { MEDIA_BUS_FMT_SBGGR8_1X8, MEDIA_BUS_FMT_SBGGR8_1X8,
+          MEDIA_BUS_FMT_SBGGR8_1X8, MEDIA_BUS_FMT_SBGGR8_1X8,
           V4L2_PIX_FMT_SBGGR8, 8, 1, },
-        { V4L2_MBUS_FMT_SGBRG8_1X8, V4L2_MBUS_FMT_SGBRG8_1X8,
-          V4L2_MBUS_FMT_SGBRG8_1X8, V4L2_MBUS_FMT_SGBRG8_1X8,
+        { MEDIA_BUS_FMT_SGBRG8_1X8, MEDIA_BUS_FMT_SGBRG8_1X8,
+          MEDIA_BUS_FMT_SGBRG8_1X8, MEDIA_BUS_FMT_SGBRG8_1X8,
           V4L2_PIX_FMT_SGBRG8, 8, 1, },
-        { V4L2_MBUS_FMT_SGRBG8_1X8, V4L2_MBUS_FMT_SGRBG8_1X8,
-          V4L2_MBUS_FMT_SGRBG8_1X8, V4L2_MBUS_FMT_SGRBG8_1X8,
+        { MEDIA_BUS_FMT_SGRBG8_1X8, MEDIA_BUS_FMT_SGRBG8_1X8,
+          MEDIA_BUS_FMT_SGRBG8_1X8, MEDIA_BUS_FMT_SGRBG8_1X8,
           V4L2_PIX_FMT_SGRBG8, 8, 1, },
-        { V4L2_MBUS_FMT_SRGGB8_1X8, V4L2_MBUS_FMT_SRGGB8_1X8,
-          V4L2_MBUS_FMT_SRGGB8_1X8, V4L2_MBUS_FMT_SRGGB8_1X8,
+        { MEDIA_BUS_FMT_SRGGB8_1X8, MEDIA_BUS_FMT_SRGGB8_1X8,
+          MEDIA_BUS_FMT_SRGGB8_1X8, MEDIA_BUS_FMT_SRGGB8_1X8,
           V4L2_PIX_FMT_SRGGB8, 8, 1, },
-        { V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8, V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8,
-          V4L2_MBUS_FMT_SBGGR10_1X10, 0,
+        { MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8, MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8,
+          MEDIA_BUS_FMT_SBGGR10_1X10, 0,
           V4L2_PIX_FMT_SBGGR10DPCM8, 8, 1, },
-        { V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8, V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8,
-          V4L2_MBUS_FMT_SGBRG10_1X10, 0,
+        { MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8, MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8,
+          MEDIA_BUS_FMT_SGBRG10_1X10, 0,
           V4L2_PIX_FMT_SGBRG10DPCM8, 8, 1, },
-        { V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8, V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8,
-          V4L2_MBUS_FMT_SGRBG10_1X10, 0,
+        { MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8, MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8,
+          MEDIA_BUS_FMT_SGRBG10_1X10, 0,
           V4L2_PIX_FMT_SGRBG10DPCM8, 8, 1, },
-        { V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8, V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8,
-          V4L2_MBUS_FMT_SRGGB10_1X10, 0,
+        { MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8, MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8,
+          MEDIA_BUS_FMT_SRGGB10_1X10, 0,
           V4L2_PIX_FMT_SRGGB10DPCM8, 8, 1, },
-        { V4L2_MBUS_FMT_SBGGR10_1X10, V4L2_MBUS_FMT_SBGGR10_1X10,
-          V4L2_MBUS_FMT_SBGGR10_1X10, V4L2_MBUS_FMT_SBGGR8_1X8,
+        { MEDIA_BUS_FMT_SBGGR10_1X10, MEDIA_BUS_FMT_SBGGR10_1X10,
+          MEDIA_BUS_FMT_SBGGR10_1X10, MEDIA_BUS_FMT_SBGGR8_1X8,
           V4L2_PIX_FMT_SBGGR10, 10, 2, },
-        { V4L2_MBUS_FMT_SGBRG10_1X10, V4L2_MBUS_FMT_SGBRG10_1X10,
-          V4L2_MBUS_FMT_SGBRG10_1X10, V4L2_MBUS_FMT_SGBRG8_1X8,
+        { MEDIA_BUS_FMT_SGBRG10_1X10, MEDIA_BUS_FMT_SGBRG10_1X10,
+          MEDIA_BUS_FMT_SGBRG10_1X10, MEDIA_BUS_FMT_SGBRG8_1X8,
           V4L2_PIX_FMT_SGBRG10, 10, 2, },
-        { V4L2_MBUS_FMT_SGRBG10_1X10, V4L2_MBUS_FMT_SGRBG10_1X10,
-          V4L2_MBUS_FMT_SGRBG10_1X10, V4L2_MBUS_FMT_SGRBG8_1X8,
+        { MEDIA_BUS_FMT_SGRBG10_1X10, MEDIA_BUS_FMT_SGRBG10_1X10,
+          MEDIA_BUS_FMT_SGRBG10_1X10, MEDIA_BUS_FMT_SGRBG8_1X8,
           V4L2_PIX_FMT_SGRBG10, 10, 2, },
-        { V4L2_MBUS_FMT_SRGGB10_1X10, V4L2_MBUS_FMT_SRGGB10_1X10,
-          V4L2_MBUS_FMT_SRGGB10_1X10, V4L2_MBUS_FMT_SRGGB8_1X8,
+        { MEDIA_BUS_FMT_SRGGB10_1X10, MEDIA_BUS_FMT_SRGGB10_1X10,
+          MEDIA_BUS_FMT_SRGGB10_1X10, MEDIA_BUS_FMT_SRGGB8_1X8,
           V4L2_PIX_FMT_SRGGB10, 10, 2, },
-        { V4L2_MBUS_FMT_SBGGR12_1X12, V4L2_MBUS_FMT_SBGGR10_1X10,
-          V4L2_MBUS_FMT_SBGGR12_1X12, V4L2_MBUS_FMT_SBGGR8_1X8,
+        { MEDIA_BUS_FMT_SBGGR12_1X12, MEDIA_BUS_FMT_SBGGR10_1X10,
+          MEDIA_BUS_FMT_SBGGR12_1X12, MEDIA_BUS_FMT_SBGGR8_1X8,
           V4L2_PIX_FMT_SBGGR12, 12, 2, },
-        { V4L2_MBUS_FMT_SGBRG12_1X12, V4L2_MBUS_FMT_SGBRG10_1X10,
-          V4L2_MBUS_FMT_SGBRG12_1X12, V4L2_MBUS_FMT_SGBRG8_1X8,
+        { MEDIA_BUS_FMT_SGBRG12_1X12, MEDIA_BUS_FMT_SGBRG10_1X10,
+          MEDIA_BUS_FMT_SGBRG12_1X12, MEDIA_BUS_FMT_SGBRG8_1X8,
           V4L2_PIX_FMT_SGBRG12, 12, 2, },
-        { V4L2_MBUS_FMT_SGRBG12_1X12, V4L2_MBUS_FMT_SGRBG10_1X10,
-          V4L2_MBUS_FMT_SGRBG12_1X12, V4L2_MBUS_FMT_SGRBG8_1X8,
+        { MEDIA_BUS_FMT_SGRBG12_1X12, MEDIA_BUS_FMT_SGRBG10_1X10,
+          MEDIA_BUS_FMT_SGRBG12_1X12, MEDIA_BUS_FMT_SGRBG8_1X8,
           V4L2_PIX_FMT_SGRBG12, 12, 2, },
-        { V4L2_MBUS_FMT_SRGGB12_1X12, V4L2_MBUS_FMT_SRGGB10_1X10,
-          V4L2_MBUS_FMT_SRGGB12_1X12, V4L2_MBUS_FMT_SRGGB8_1X8,
+        { MEDIA_BUS_FMT_SRGGB12_1X12, MEDIA_BUS_FMT_SRGGB10_1X10,
+          MEDIA_BUS_FMT_SRGGB12_1X12, MEDIA_BUS_FMT_SRGGB8_1X8,
           V4L2_PIX_FMT_SRGGB12, 12, 2, },
-        { V4L2_MBUS_FMT_UYVY8_1X16, V4L2_MBUS_FMT_UYVY8_1X16,
-          V4L2_MBUS_FMT_UYVY8_1X16, 0,
+        { MEDIA_BUS_FMT_UYVY8_1X16, MEDIA_BUS_FMT_UYVY8_1X16,
+          MEDIA_BUS_FMT_UYVY8_1X16, 0,
           V4L2_PIX_FMT_UYVY, 16, 2, },
-        { V4L2_MBUS_FMT_YUYV8_1X16, V4L2_MBUS_FMT_YUYV8_1X16,
-          V4L2_MBUS_FMT_YUYV8_1X16, 0,
+        { MEDIA_BUS_FMT_YUYV8_1X16, MEDIA_BUS_FMT_YUYV8_1X16,
+          MEDIA_BUS_FMT_YUYV8_1X16, 0,
           V4L2_PIX_FMT_YUYV, 16, 2, },
-        { V4L2_MBUS_FMT_UYVY8_2X8, V4L2_MBUS_FMT_UYVY8_2X8,
-          V4L2_MBUS_FMT_UYVY8_2X8, 0,
+        { MEDIA_BUS_FMT_UYVY8_2X8, MEDIA_BUS_FMT_UYVY8_2X8,
+          MEDIA_BUS_FMT_UYVY8_2X8, 0,
           V4L2_PIX_FMT_UYVY, 8, 2, },
-        { V4L2_MBUS_FMT_YUYV8_2X8, V4L2_MBUS_FMT_YUYV8_2X8,
-          V4L2_MBUS_FMT_YUYV8_2X8, 0,
+        { MEDIA_BUS_FMT_YUYV8_2X8, MEDIA_BUS_FMT_YUYV8_2X8,
+          MEDIA_BUS_FMT_YUYV8_2X8, 0,
           V4L2_PIX_FMT_YUYV, 8, 2, },
         /* Empty entry to catch the unsupported pixel code (0) used by the CCDC
          * module and avoid NULL pointer dereferences.
@@ -114,8 +114,7 @@ static struct isp_format_info formats[] = {
         { 0, }
 };
 
-const struct isp_format_info *
-omap3isp_video_format_info(enum v4l2_mbus_pixelcode code)
+const struct isp_format_info *omap3isp_video_format_info(u32 code)
 {
         unsigned int i;
 
diff --git a/drivers/media/platform/omap3isp/ispvideo.h b/drivers/media/platform/omap3isp/ispvideo.h
index 0b7efedc3da9..4071dd7060ea 100644
--- a/drivers/media/platform/omap3isp/ispvideo.h
+++ b/drivers/media/platform/omap3isp/ispvideo.h
@@ -44,10 +44,10 @@ struct v4l2_pix_format;
  * @bpp: Bytes per pixel (when stored in memory)
  */
 struct isp_format_info {
-        enum v4l2_mbus_pixelcode code;
-        enum v4l2_mbus_pixelcode truncated;
-        enum v4l2_mbus_pixelcode uncompressed;
-        enum v4l2_mbus_pixelcode flavor;
+        u32 code;
+        u32 truncated;
+        u32 uncompressed;
+        u32 flavor;
         u32 pixelformat;
         unsigned int width;
         unsigned int bpp;
@@ -206,6 +206,6 @@ void omap3isp_video_resume(struct isp_video *video, int continuous);
 struct media_pad *omap3isp_video_remote_pad(struct isp_video *video);
 
 const struct isp_format_info *
-omap3isp_video_format_info(enum v4l2_mbus_pixelcode code);
+omap3isp_video_format_info(u32 code);
 
 #endif /* OMAP3_ISP_VIDEO_H */