Merge tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[deliverable/linux.git] / drivers / staging / media / omap4iss / iss_csi2.c

diff --git a/drivers/staging/media/omap4iss/iss_csi2.c b/drivers/staging/media/omap4iss/iss_csi2.c
index 47f86b306cb6957bba91f119d61610a4aed29c85..21971c675b8c518148f8b523ae134d8063222514 100644 (file)
--- a/drivers/staging/media/omap4iss/iss_csi2.c
+++ b/drivers/staging/media/omap4iss/iss_csi2.c
@@ -93,20 +93,20 @@ static void csi2_recv_config(struct iss_csi2_device *csi2,
 }
 
 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_SBGGR8_1X8,
-       V4L2_MBUS_FMT_SGBRG8_1X8,
-       V4L2_MBUS_FMT_SGRBG8_1X8,
-       V4L2_MBUS_FMT_SRGGB8_1X8,
-       V4L2_MBUS_FMT_UYVY8_1X16,
-       V4L2_MBUS_FMT_YUYV8_1X16,
+       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_SBGGR8_1X8,
+       MEDIA_BUS_FMT_SGBRG8_1X8,
+       MEDIA_BUS_FMT_SGRBG8_1X8,
+       MEDIA_BUS_FMT_SRGGB8_1X8,
+       MEDIA_BUS_FMT_UYVY8_1X16,
+       MEDIA_BUS_FMT_YUYV8_1X16,
 };
 
 /* To set the format on the CSI2 requires a mapping function that takes
@@ -201,26 +201,26 @@ static u16 csi2_ctx_map_format(struct iss_csi2_device *csi2)
        int fmtidx, destidx;
 
        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_SBGGR8_1X8:
-       case V4L2_MBUS_FMT_SGBRG8_1X8:
-       case V4L2_MBUS_FMT_SGRBG8_1X8:
-       case V4L2_MBUS_FMT_SRGGB8_1X8:
+       case MEDIA_BUS_FMT_SBGGR8_1X8:
+       case MEDIA_BUS_FMT_SGBRG8_1X8:
+       case MEDIA_BUS_FMT_SGRBG8_1X8:
+       case MEDIA_BUS_FMT_SRGGB8_1X8:
                fmtidx = 2;
                break;
-       case V4L2_MBUS_FMT_UYVY8_1X16:
-       case V4L2_MBUS_FMT_YUYV8_1X16:
+       case MEDIA_BUS_FMT_UYVY8_1X16:
+       case MEDIA_BUS_FMT_YUYV8_1X16:
                fmtidx = 3;
                break;
        default:
@@ -817,7 +817,7 @@ csi2_try_format(struct iss_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 iss_format_info *info;
        unsigned int i;
@@ -832,7 +832,7 @@ csi2_try_format(struct iss_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);
@@ -1020,7 +1020,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);