Commit eee96360 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: rcar-csi2: Use mipi-csi2.h 



Replace the hardcoded MIPI CSI-2 data types with macros from
mipi-csi2.h.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 3743d9e4

drivers/media/platform/rcar-vin/rcar-csi2.c

+46 −11
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/reset.h>

#include <linux/sys_soc.h>



#include <media/mipi-csi2.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-device.h>

#include <media/v4l2-fwnode.h>
@@ -412,17 +413,51 @@ struct rcar_csi2_format { 
};



static const struct rcar_csi2_format rcar_csi2_formats[] = {

	{ .code = MEDIA_BUS_FMT_RGB888_1X24,	.datatype = 0x24, .bpp = 24 },

	{ .code = MEDIA_BUS_FMT_UYVY8_1X16,	.datatype = 0x1e, .bpp = 16 },

	{ .code = MEDIA_BUS_FMT_YUYV8_1X16,	.datatype = 0x1e, .bpp = 16 },

	{ .code = MEDIA_BUS_FMT_UYVY8_2X8,	.datatype = 0x1e, .bpp = 16 },

	{ .code = MEDIA_BUS_FMT_YUYV10_2X10,	.datatype = 0x1e, .bpp = 20 },

	{ .code = MEDIA_BUS_FMT_Y10_1X10,	.datatype = 0x2b, .bpp = 10 },

	{ .code = MEDIA_BUS_FMT_SBGGR8_1X8,     .datatype = 0x2a, .bpp = 8 },

	{ .code = MEDIA_BUS_FMT_SGBRG8_1X8,     .datatype = 0x2a, .bpp = 8 },

	{ .code = MEDIA_BUS_FMT_SGRBG8_1X8,     .datatype = 0x2a, .bpp = 8 },

	{ .code = MEDIA_BUS_FMT_SRGGB8_1X8,     .datatype = 0x2a, .bpp = 8 },

	{ .code = MEDIA_BUS_FMT_Y8_1X8,		.datatype = 0x2a, .bpp = 8 },

	{

		.code = MEDIA_BUS_FMT_RGB888_1X24,

		.datatype = MIPI_CSI2_DT_RGB888,

		.bpp = 24,

	}, {

		.code = MEDIA_BUS_FMT_UYVY8_1X16,

		.datatype = MIPI_CSI2_DT_YUV422_8B,

		.bpp = 16,

	}, {

		.code = MEDIA_BUS_FMT_YUYV8_1X16,

		.datatype = MIPI_CSI2_DT_YUV422_8B,

		.bpp = 16,

	}, {

		.code = MEDIA_BUS_FMT_UYVY8_2X8,

		.datatype = MIPI_CSI2_DT_YUV422_8B,

		.bpp = 16,

	}, {

		.code = MEDIA_BUS_FMT_YUYV10_2X10,

		.datatype = MIPI_CSI2_DT_YUV422_8B,

		.bpp = 20,

	}, {

		.code = MEDIA_BUS_FMT_Y10_1X10,

		.datatype = MIPI_CSI2_DT_RAW10,

		.bpp = 10,

	}, {

		.code = MEDIA_BUS_FMT_SBGGR8_1X8,

		.datatype = MIPI_CSI2_DT_RAW8,

		.bpp = 8,

	}, {

		.code = MEDIA_BUS_FMT_SGBRG8_1X8,

		.datatype = MIPI_CSI2_DT_RAW8,

		.bpp = 8,

	}, {

		.code = MEDIA_BUS_FMT_SGRBG8_1X8,

		.datatype = MIPI_CSI2_DT_RAW8,

		.bpp = 8,

	}, {

		.code = MEDIA_BUS_FMT_SRGGB8_1X8,

		.datatype = MIPI_CSI2_DT_RAW8,

		.bpp = 8,

	}, {

		.code = MEDIA_BUS_FMT_Y8_1X8,

		.datatype = MIPI_CSI2_DT_RAW8,

		.bpp = 8,

	},

};



static const struct rcar_csi2_format *rcsi2_code_to_fmt(unsigned int code)