No longer use the old V4L2 based MBUS_FMT definitions. Instead, use the
newer media bus format definitions.

Signed-off-by: Sakari Ailus <sakari.ai...@linux.intel.com>
---
 utils/media-ctl/libv4l2subdev.c | 54 ++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/utils/media-ctl/libv4l2subdev.c b/utils/media-ctl/libv4l2subdev.c
index 949eeff..b33d3fd 100644
--- a/utils/media-ctl/libv4l2subdev.c
+++ b/utils/media-ctl/libv4l2subdev.c
@@ -719,33 +719,33 @@ static struct {
        const char *name;
        enum v4l2_mbus_pixelcode code;
 } mbus_formats[] = {
-       { "Y8", V4L2_MBUS_FMT_Y8_1X8},
-       { "Y10", V4L2_MBUS_FMT_Y10_1X10 },
-       { "Y12", V4L2_MBUS_FMT_Y12_1X12 },
-       { "YUYV", V4L2_MBUS_FMT_YUYV8_1X16 },
-       { "YUYV1_5X8", V4L2_MBUS_FMT_YUYV8_1_5X8 },
-       { "YUYV2X8", V4L2_MBUS_FMT_YUYV8_2X8 },
-       { "UYVY", V4L2_MBUS_FMT_UYVY8_1X16 },
-       { "UYVY1_5X8", V4L2_MBUS_FMT_UYVY8_1_5X8 },
-       { "UYVY2X8", V4L2_MBUS_FMT_UYVY8_2X8 },
-       { "SBGGR8", V4L2_MBUS_FMT_SBGGR8_1X8 },
-       { "SGBRG8", V4L2_MBUS_FMT_SGBRG8_1X8 },
-       { "SGRBG8", V4L2_MBUS_FMT_SGRBG8_1X8 },
-       { "SRGGB8", V4L2_MBUS_FMT_SRGGB8_1X8 },
-       { "SBGGR10", V4L2_MBUS_FMT_SBGGR10_1X10 },
-       { "SGBRG10", V4L2_MBUS_FMT_SGBRG10_1X10 },
-       { "SGRBG10", V4L2_MBUS_FMT_SGRBG10_1X10 },
-       { "SRGGB10", V4L2_MBUS_FMT_SRGGB10_1X10 },
-       { "SBGGR10_DPCM8", V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8 },
-       { "SGBRG10_DPCM8", V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8 },
-       { "SGRBG10_DPCM8", V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8 },
-       { "SRGGB10_DPCM8", V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8 },
-       { "SBGGR12", V4L2_MBUS_FMT_SBGGR12_1X12 },
-       { "SGBRG12", V4L2_MBUS_FMT_SGBRG12_1X12 },
-       { "SGRBG12", V4L2_MBUS_FMT_SGRBG12_1X12 },
-       { "SRGGB12", V4L2_MBUS_FMT_SRGGB12_1X12 },
-       { "AYUV32", V4L2_MBUS_FMT_AYUV8_1X32 },
-       { "ARGB32", V4L2_MBUS_FMT_ARGB8888_1X32 },
+       { "Y8", MEDIA_BUS_FMT_Y8_1X8},
+       { "Y10", MEDIA_BUS_FMT_Y10_1X10 },
+       { "Y12", MEDIA_BUS_FMT_Y12_1X12 },
+       { "YUYV", MEDIA_BUS_FMT_YUYV8_1X16 },
+       { "YUYV1_5X8", MEDIA_BUS_FMT_YUYV8_1_5X8 },
+       { "YUYV2X8", MEDIA_BUS_FMT_YUYV8_2X8 },
+       { "UYVY", MEDIA_BUS_FMT_UYVY8_1X16 },
+       { "UYVY1_5X8", MEDIA_BUS_FMT_UYVY8_1_5X8 },
+       { "UYVY2X8", MEDIA_BUS_FMT_UYVY8_2X8 },
+       { "SBGGR8", MEDIA_BUS_FMT_SBGGR8_1X8 },
+       { "SGBRG8", MEDIA_BUS_FMT_SGBRG8_1X8 },
+       { "SGRBG8", MEDIA_BUS_FMT_SGRBG8_1X8 },
+       { "SRGGB8", MEDIA_BUS_FMT_SRGGB8_1X8 },
+       { "SBGGR10", MEDIA_BUS_FMT_SBGGR10_1X10 },
+       { "SGBRG10", MEDIA_BUS_FMT_SGBRG10_1X10 },
+       { "SGRBG10", MEDIA_BUS_FMT_SGRBG10_1X10 },
+       { "SRGGB10", MEDIA_BUS_FMT_SRGGB10_1X10 },
+       { "SBGGR10_DPCM8", MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8 },
+       { "SGBRG10_DPCM8", MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8 },
+       { "SGRBG10_DPCM8", MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8 },
+       { "SRGGB10_DPCM8", MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8 },
+       { "SBGGR12", MEDIA_BUS_FMT_SBGGR12_1X12 },
+       { "SGBRG12", MEDIA_BUS_FMT_SGBRG12_1X12 },
+       { "SGRBG12", MEDIA_BUS_FMT_SGRBG12_1X12 },
+       { "SRGGB12", MEDIA_BUS_FMT_SRGGB12_1X12 },
+       { "AYUV32", MEDIA_BUS_FMT_AYUV8_1X32 },
+       { "ARGB32", MEDIA_BUS_FMT_ARGB8888_1X32 },
 };
 
 const char *v4l2_subdev_pixelcode_to_string(enum v4l2_mbus_pixelcode code)
-- 
2.1.0.231.g7484e3b

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to