8 files changed, 62 insertions, 62 deletions
diff --git a/drivers/media/platform/vsp1/vsp1_bru.c b/drivers/media/platform/vsp1/vsp1_bru.c
index a0c1984c733e..b21f381a9862 100644
--- a/drivers/media/platform/vsp1/vsp1_bru.c
+++ b/drivers/media/platform/vsp1/vsp1_bru.c
@@ -187,8 +187,8 @@ static int bru_enum_mbus_code(struct v4l2_subdev *subdev,
                              struct v4l2_subdev_mbus_code_enum *code)
 {
        static const unsigned int codes[] = {
-                V4L2_MBUS_FMT_ARGB8888_1X32,
+                MEDIA_BUS_FMT_ARGB8888_1X32,
-                V4L2_MBUS_FMT_AYUV8_1X32,
+                MEDIA_BUS_FMT_AYUV8_1X32,
        };
        struct v4l2_mbus_framefmt *format;
@@ -215,8 +215,8 @@ static int bru_enum_frame_size(struct v4l2_subdev *subdev,
        if (fse->index)
                return -EINVAL;
-        if (fse->code != V4L2_MBUS_FMT_ARGB8888_1X32 &&
+        if (fse->code != MEDIA_BUS_FMT_ARGB8888_1X32 &&
-            fse->code != V4L2_MBUS_FMT_AYUV8_1X32)
+            fse->code != MEDIA_BUS_FMT_AYUV8_1X32)
                return -EINVAL;
        fse->min_width = BRU_MIN_SIZE;
@@ -261,9 +261,9 @@ static void bru_try_format(struct vsp1_bru *bru, struct v4l2_subdev_fh *fh,
        switch (pad) {
        case BRU_PAD_SINK(0):
                /* Default to YUV if the requested format is not supported. */
-                if (fmt->code != V4L2_MBUS_FMT_ARGB8888_1X32 &&
+                if (fmt->code != MEDIA_BUS_FMT_ARGB8888_1X32 &&
-                    fmt->code != V4L2_MBUS_FMT_AYUV8_1X32)
+                    fmt->code != MEDIA_BUS_FMT_AYUV8_1X32)
-                        fmt->code = V4L2_MBUS_FMT_AYUV8_1X32;
+                        fmt->code = MEDIA_BUS_FMT_AYUV8_1X32;
                break;
        default:
diff --git a/drivers/media/platform/vsp1/vsp1_hsit.c b/drivers/media/platform/vsp1/vsp1_hsit.c
index db2950a73c60..80bedc554ee3 100644
--- a/drivers/media/platform/vsp1/vsp1_hsit.c
+++ b/drivers/media/platform/vsp1/vsp1_hsit.c
@@ -70,9 +70,9 @@ static int hsit_enum_mbus_code(struct v4l2_subdev *subdev,
        if ((code->pad == HSIT_PAD_SINK && !hsit->inverse) |
            (code->pad == HSIT_PAD_SOURCE && hsit->inverse))
-                code->code = V4L2_MBUS_FMT_ARGB8888_1X32;
+                code->code = MEDIA_BUS_FMT_ARGB8888_1X32;
        else
-                code->code = V4L2_MBUS_FMT_AHSV8888_1X32;
+                code->code = MEDIA_BUS_FMT_AHSV8888_1X32;
        return 0;
 }
@@ -136,8 +136,8 @@ static int hsit_set_format(struct v4l2_subdev *subdev,
                return 0;
        }
-        format->code = hsit->inverse ? V4L2_MBUS_FMT_AHSV8888_1X32
+        format->code = hsit->inverse ? MEDIA_BUS_FMT_AHSV8888_1X32
-                     : V4L2_MBUS_FMT_ARGB8888_1X32;
+                     : MEDIA_BUS_FMT_ARGB8888_1X32;
        format->width = clamp_t(unsigned int, fmt->format.width,
                                HSIT_MIN_SIZE, HSIT_MAX_SIZE);
        format->height = clamp_t(unsigned int, fmt->format.height,
@@ -151,8 +151,8 @@ static int hsit_set_format(struct v4l2_subdev *subdev,
        format = vsp1_entity_get_pad_format(&hsit->entity, fh, HSIT_PAD_SOURCE,
                                            fmt->which);
        *format = fmt->format;
-        format->code = hsit->inverse ? V4L2_MBUS_FMT_ARGB8888_1X32
+        format->code = hsit->inverse ? MEDIA_BUS_FMT_ARGB8888_1X32
-                     : V4L2_MBUS_FMT_AHSV8888_1X32;
+                     : MEDIA_BUS_FMT_AHSV8888_1X32;
        return 0;
 }
diff --git a/drivers/media/platform/vsp1/vsp1_lif.c b/drivers/media/platform/vsp1/vsp1_lif.c
index d4fb23e9c4a8..17a6ca7dafe6 100644
--- a/drivers/media/platform/vsp1/vsp1_lif.c
+++ b/drivers/media/platform/vsp1/vsp1_lif.c
@@ -78,8 +78,8 @@ static int lif_enum_mbus_code(struct v4l2_subdev *subdev,
                              struct v4l2_subdev_mbus_code_enum *code)
 {
        static const unsigned int codes[] = {
-                V4L2_MBUS_FMT_ARGB8888_1X32,
+                MEDIA_BUS_FMT_ARGB8888_1X32,
-                V4L2_MBUS_FMT_AYUV8_1X32,
+                MEDIA_BUS_FMT_AYUV8_1X32,
        };
        if (code->pad == LIF_PAD_SINK) {
@@ -147,9 +147,9 @@ static int lif_set_format(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh,
        struct v4l2_mbus_framefmt *format;
        /* Default to YUV if the requested format is not supported. */
-        if (fmt->format.code != V4L2_MBUS_FMT_ARGB8888_1X32 &&
+        if (fmt->format.code != MEDIA_BUS_FMT_ARGB8888_1X32 &&
-            fmt->format.code != V4L2_MBUS_FMT_AYUV8_1X32)
+            fmt->format.code != MEDIA_BUS_FMT_AYUV8_1X32)
-                fmt->format.code = V4L2_MBUS_FMT_AYUV8_1X32;
+                fmt->format.code = MEDIA_BUS_FMT_AYUV8_1X32;
        format = vsp1_entity_get_pad_format(&lif->entity, fh, fmt->pad,
                                            fmt->which);
diff --git a/drivers/media/platform/vsp1/vsp1_lut.c b/drivers/media/platform/vsp1/vsp1_lut.c
index fea36ebe2565..6f185c3621fe 100644
--- a/drivers/media/platform/vsp1/vsp1_lut.c
+++ b/drivers/media/platform/vsp1/vsp1_lut.c
@@ -86,9 +86,9 @@ static int lut_enum_mbus_code(struct v4l2_subdev *subdev,
                              struct v4l2_subdev_mbus_code_enum *code)
 {
        static const unsigned int codes[] = {
-                V4L2_MBUS_FMT_ARGB8888_1X32,
+                MEDIA_BUS_FMT_ARGB8888_1X32,
-                V4L2_MBUS_FMT_AHSV8888_1X32,
+                MEDIA_BUS_FMT_AHSV8888_1X32,
-                V4L2_MBUS_FMT_AYUV8_1X32,
+                MEDIA_BUS_FMT_AYUV8_1X32,
        };
        struct v4l2_mbus_framefmt *format;
@@ -158,10 +158,10 @@ static int lut_set_format(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh,
        struct v4l2_mbus_framefmt *format;
        /* Default to YUV if the requested format is not supported. */
-        if (fmt->format.code != V4L2_MBUS_FMT_ARGB8888_1X32 &&
+        if (fmt->format.code != MEDIA_BUS_FMT_ARGB8888_1X32 &&
-            fmt->format.code != V4L2_MBUS_FMT_AHSV8888_1X32 &&
+            fmt->format.code != MEDIA_BUS_FMT_AHSV8888_1X32 &&
-            fmt->format.code != V4L2_MBUS_FMT_AYUV8_1X32)
+            fmt->format.code != MEDIA_BUS_FMT_AYUV8_1X32)
-                fmt->format.code = V4L2_MBUS_FMT_AYUV8_1X32;
+                fmt->format.code = MEDIA_BUS_FMT_AYUV8_1X32;
        format = vsp1_entity_get_pad_format(&lut->entity, fh, fmt->pad,
                                            fmt->which);
diff --git a/drivers/media/platform/vsp1/vsp1_rwpf.c b/drivers/media/platform/vsp1/vsp1_rwpf.c
index ec3dab6a9b9b..1f1ba26a834a 100644
--- a/drivers/media/platform/vsp1/vsp1_rwpf.c
+++ b/drivers/media/platform/vsp1/vsp1_rwpf.c
@@ -29,8 +29,8 @@ int vsp1_rwpf_enum_mbus_code(struct v4l2_subdev *subdev,
                             struct v4l2_subdev_mbus_code_enum *code)
 {
        static const unsigned int codes[] = {
-                V4L2_MBUS_FMT_ARGB8888_1X32,
+                MEDIA_BUS_FMT_ARGB8888_1X32,
-                V4L2_MBUS_FMT_AYUV8_1X32,
+                MEDIA_BUS_FMT_AYUV8_1X32,
        };
        if (code->index >= ARRAY_SIZE(codes))
@@ -103,9 +103,9 @@ int vsp1_rwpf_set_format(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh,
        struct v4l2_rect *crop;
        /* Default to YUV if the requested format is not supported. */
-        if (fmt->format.code != V4L2_MBUS_FMT_ARGB8888_1X32 &&
+        if (fmt->format.code != MEDIA_BUS_FMT_ARGB8888_1X32 &&
-            fmt->format.code != V4L2_MBUS_FMT_AYUV8_1X32)
+            fmt->format.code != MEDIA_BUS_FMT_AYUV8_1X32)
-                fmt->format.code = V4L2_MBUS_FMT_AYUV8_1X32;
+                fmt->format.code = MEDIA_BUS_FMT_AYUV8_1X32;
        format = vsp1_entity_get_pad_format(&rwpf->entity, fh, fmt->pad,
                                            fmt->which);
diff --git a/drivers/media/platform/vsp1/vsp1_sru.c b/drivers/media/platform/vsp1/vsp1_sru.c
index b7d3c8b9f189..1129494c7cfc 100644
--- a/drivers/media/platform/vsp1/vsp1_sru.c
+++ b/drivers/media/platform/vsp1/vsp1_sru.c
@@ -139,7 +139,7 @@ static int sru_s_stream(struct v4l2_subdev *subdev, int enable)
        input = &sru->entity.formats[SRU_PAD_SINK];
        output = &sru->entity.formats[SRU_PAD_SOURCE];
-        if (input->code == V4L2_MBUS_FMT_ARGB8888_1X32)
+        if (input->code == MEDIA_BUS_FMT_ARGB8888_1X32)
                ctrl0 = VI6_SRU_CTRL0_PARAM2 | VI6_SRU_CTRL0_PARAM3
                      | VI6_SRU_CTRL0_PARAM4;
        else
@@ -170,8 +170,8 @@ static int sru_enum_mbus_code(struct v4l2_subdev *subdev,
                              struct v4l2_subdev_mbus_code_enum *code)
 {
        static const unsigned int codes[] = {
-                V4L2_MBUS_FMT_ARGB8888_1X32,
+                MEDIA_BUS_FMT_ARGB8888_1X32,
-                V4L2_MBUS_FMT_AYUV8_1X32,
+                MEDIA_BUS_FMT_AYUV8_1X32,
        };
        struct v4l2_mbus_framefmt *format;
@@ -248,9 +248,9 @@ static void sru_try_format(struct vsp1_sru *sru, struct v4l2_subdev_fh *fh,
        switch (pad) {
        case SRU_PAD_SINK:
                /* Default to YUV if the requested format is not supported. */
-                if (fmt->code != V4L2_MBUS_FMT_ARGB8888_1X32 &&
+                if (fmt->code != MEDIA_BUS_FMT_ARGB8888_1X32 &&
-                    fmt->code != V4L2_MBUS_FMT_AYUV8_1X32)
+                    fmt->code != MEDIA_BUS_FMT_AYUV8_1X32)
-                        fmt->code = V4L2_MBUS_FMT_AYUV8_1X32;
+                        fmt->code = MEDIA_BUS_FMT_AYUV8_1X32;
                fmt->width = clamp(fmt->width, SRU_MIN_SIZE, SRU_MAX_SIZE);
                fmt->height = clamp(fmt->height, SRU_MIN_SIZE, SRU_MAX_SIZE);
diff --git a/drivers/media/platform/vsp1/vsp1_uds.c b/drivers/media/platform/vsp1/vsp1_uds.c
index de92ef4944b3..a4afec133800 100644
--- a/drivers/media/platform/vsp1/vsp1_uds.c
+++ b/drivers/media/platform/vsp1/vsp1_uds.c
@@ -173,8 +173,8 @@ static int uds_enum_mbus_code(struct v4l2_subdev *subdev,
                              struct v4l2_subdev_mbus_code_enum *code)
 {
        static const unsigned int codes[] = {
-                V4L2_MBUS_FMT_ARGB8888_1X32,
+                MEDIA_BUS_FMT_ARGB8888_1X32,
-                V4L2_MBUS_FMT_AYUV8_1X32,
+                MEDIA_BUS_FMT_AYUV8_1X32,
        };
        if (code->pad == UDS_PAD_SINK) {
@@ -246,9 +246,9 @@ static void uds_try_format(struct vsp1_uds *uds, struct v4l2_subdev_fh *fh,
        switch (pad) {
        case UDS_PAD_SINK:
                /* Default to YUV if the requested format is not supported. */
-                if (fmt->code != V4L2_MBUS_FMT_ARGB8888_1X32 &&
+                if (fmt->code != MEDIA_BUS_FMT_ARGB8888_1X32 &&
-                    fmt->code != V4L2_MBUS_FMT_AYUV8_1X32)
+                    fmt->code != MEDIA_BUS_FMT_AYUV8_1X32)
-                        fmt->code = V4L2_MBUS_FMT_AYUV8_1X32;
+                        fmt->code = MEDIA_BUS_FMT_AYUV8_1X32;
                fmt->width = clamp(fmt->width, UDS_MIN_SIZE, UDS_MAX_SIZE);
                fmt->height = clamp(fmt->height, UDS_MIN_SIZE, UDS_MAX_SIZE);
diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
index 915a20eb003e..d91f19a9e1c1 100644
--- a/drivers/media/platform/vsp1/vsp1_video.c
+++ b/drivers/media/platform/vsp1/vsp1_video.c
@@ -48,85 +48,85 @@
 */
 static const struct vsp1_format_info vsp1_video_formats[] = {
-        { V4L2_PIX_FMT_RGB332, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_RGB332, MEDIA_BUS_FMT_ARGB8888_1X32,
          VI6_FMT_RGB_332, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
          1, { 8, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_ARGB444, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_ARGB444, MEDIA_BUS_FMT_ARGB8888_1X32,
          VI6_FMT_ARGB_4444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS,
          1, { 16, 0, 0 }, false, false, 1, 1, true },
-        { V4L2_PIX_FMT_XRGB444, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_XRGB444, MEDIA_BUS_FMT_ARGB8888_1X32,
          VI6_FMT_XRGB_4444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS,
          1, { 16, 0, 0 }, false, false, 1, 1, true },
-        { V4L2_PIX_FMT_ARGB555, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_ARGB555, MEDIA_BUS_FMT_ARGB8888_1X32,
          VI6_FMT_ARGB_1555, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS,
          1, { 16, 0, 0 }, false, false, 1, 1, true },
-        { V4L2_PIX_FMT_XRGB555, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_XRGB555, MEDIA_BUS_FMT_ARGB8888_1X32,
          VI6_FMT_XRGB_1555, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS,
          1, { 16, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_RGB565, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_RGB565, MEDIA_BUS_FMT_ARGB8888_1X32,
          VI6_FMT_RGB_565, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS,
          1, { 16, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_BGR24, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_BGR24, MEDIA_BUS_FMT_ARGB8888_1X32,
          VI6_FMT_BGR_888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
          1, { 24, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_RGB24, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_RGB24, MEDIA_BUS_FMT_ARGB8888_1X32,
          VI6_FMT_RGB_888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
          1, { 24, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_ABGR32, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_ABGR32, MEDIA_BUS_FMT_ARGB8888_1X32,
          VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS,
          1, { 32, 0, 0 }, false, false, 1, 1, true },
-        { V4L2_PIX_FMT_XBGR32, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_XBGR32, MEDIA_BUS_FMT_ARGB8888_1X32,
          VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS,
          1, { 32, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_ARGB32, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_ARGB32, MEDIA_BUS_FMT_ARGB8888_1X32,
          VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
          1, { 32, 0, 0 }, false, false, 1, 1, true },
-        { V4L2_PIX_FMT_XRGB32, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_XRGB32, MEDIA_BUS_FMT_ARGB8888_1X32,
          VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
          1, { 32, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_UYVY, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_UYVY, MEDIA_BUS_FMT_AYUV8_1X32,
          VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
          1, { 16, 0, 0 }, false, false, 2, 1, false },
-        { V4L2_PIX_FMT_VYUY, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_VYUY, MEDIA_BUS_FMT_AYUV8_1X32,
          VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
          1, { 16, 0, 0 }, false, true, 2, 1, false },
-        { V4L2_PIX_FMT_YUYV, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_YUYV, MEDIA_BUS_FMT_AYUV8_1X32,
          VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
          1, { 16, 0, 0 }, true, false, 2, 1, false },
-        { V4L2_PIX_FMT_YVYU, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_YVYU, MEDIA_BUS_FMT_AYUV8_1X32,
          VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
          1, { 16, 0, 0 }, true, true, 2, 1, false },
-        { V4L2_PIX_FMT_NV12M, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_NV12M, MEDIA_BUS_FMT_AYUV8_1X32,
          VI6_FMT_Y_UV_420, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
          2, { 8, 16, 0 }, false, false, 2, 2, false },
-        { V4L2_PIX_FMT_NV21M, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_NV21M, MEDIA_BUS_FMT_AYUV8_1X32,
          VI6_FMT_Y_UV_420, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
          2, { 8, 16, 0 }, false, true, 2, 2, false },
-        { V4L2_PIX_FMT_NV16M, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_NV16M, MEDIA_BUS_FMT_AYUV8_1X32,
          VI6_FMT_Y_UV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
          2, { 8, 16, 0 }, false, false, 2, 1, false },
-        { V4L2_PIX_FMT_NV61M, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_NV61M, MEDIA_BUS_FMT_AYUV8_1X32,
          VI6_FMT_Y_UV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
          2, { 8, 16, 0 }, false, true, 2, 1, false },
-        { V4L2_PIX_FMT_YUV420M, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_YUV420M, MEDIA_BUS_FMT_AYUV8_1X32,
          VI6_FMT_Y_U_V_420, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
          VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
          3, { 8, 8, 8 }, false, false, 2, 2, false },