Commit f5fe58fd authored by Boris BREZILLON's avatar Boris BREZILLON Committed by Mauro Carvalho Chehab
Browse files

[media] i2c: Make use of media_bus_format enum 



In order to have subsytem agnostic media bus format definitions we've
moved media bus definitions to include/uapi/linux/media-bus-format.h and
prefixed values with MEDIA_BUS_FMT instead of V4L2_MBUS_FMT.

Replace all references to the old definitions in i2c drivers.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 32b32ce8

drivers/media/i2c/adv7170.c

+8 −8
Original line number Diff line number Diff line
@@ -63,9 +63,9 @@ static inline struct adv7170 *to_adv7170(struct v4l2_subdev *sd) 


static char *inputs[] = { "pass_through", "play_back" };



static enum v4l2_mbus_pixelcode adv7170_codes[] = {

	V4L2_MBUS_FMT_UYVY8_2X8,

	V4L2_MBUS_FMT_UYVY8_1X16,

static u32 adv7170_codes[] = {

	MEDIA_BUS_FMT_UYVY8_2X8,

	MEDIA_BUS_FMT_UYVY8_1X16,

};



/* ----------------------------------------------------------------------- */
@@ -263,7 +263,7 @@ static int adv7170_s_routing(struct v4l2_subdev *sd, 
}



static int adv7170_enum_fmt(struct v4l2_subdev *sd, unsigned int index,

				enum v4l2_mbus_pixelcode *code)

				u32 *code)

{

	if (index >= ARRAY_SIZE(adv7170_codes))

		return -EINVAL;
@@ -278,9 +278,9 @@ static int adv7170_g_fmt(struct v4l2_subdev *sd, 
	u8 val = adv7170_read(sd, 0x7);



	if ((val & 0x40) == (1 << 6))

		mf->code = V4L2_MBUS_FMT_UYVY8_1X16;

		mf->code = MEDIA_BUS_FMT_UYVY8_1X16;

	else

		mf->code = V4L2_MBUS_FMT_UYVY8_2X8;

		mf->code = MEDIA_BUS_FMT_UYVY8_2X8;



	mf->colorspace  = V4L2_COLORSPACE_SMPTE170M;

	mf->width       = 0;
@@ -297,11 +297,11 @@ static int adv7170_s_fmt(struct v4l2_subdev *sd, 
	int ret;



	switch (mf->code) {

	case V4L2_MBUS_FMT_UYVY8_2X8:

	case MEDIA_BUS_FMT_UYVY8_2X8:

		val &= ~0x40;

		break;



	case V4L2_MBUS_FMT_UYVY8_1X16:

	case MEDIA_BUS_FMT_UYVY8_1X16:

		val |= 0x40;

		break;

drivers/media/i2c/adv7175.c

+8 −8
Original line number Diff line number Diff line
@@ -60,9 +60,9 @@ static inline struct adv7175 *to_adv7175(struct v4l2_subdev *sd) 


static char *inputs[] = { "pass_through", "play_back", "color_bar" };



static enum v4l2_mbus_pixelcode adv7175_codes[] = {

	V4L2_MBUS_FMT_UYVY8_2X8,

	V4L2_MBUS_FMT_UYVY8_1X16,

static u32 adv7175_codes[] = {

	MEDIA_BUS_FMT_UYVY8_2X8,

	MEDIA_BUS_FMT_UYVY8_1X16,

};



/* ----------------------------------------------------------------------- */
@@ -301,7 +301,7 @@ static int adv7175_s_routing(struct v4l2_subdev *sd, 
}



static int adv7175_enum_fmt(struct v4l2_subdev *sd, unsigned int index,

				enum v4l2_mbus_pixelcode *code)

				u32 *code)

{

	if (index >= ARRAY_SIZE(adv7175_codes))

		return -EINVAL;
@@ -316,9 +316,9 @@ static int adv7175_g_fmt(struct v4l2_subdev *sd, 
	u8 val = adv7175_read(sd, 0x7);



	if ((val & 0x40) == (1 << 6))

		mf->code = V4L2_MBUS_FMT_UYVY8_1X16;

		mf->code = MEDIA_BUS_FMT_UYVY8_1X16;

	else

		mf->code = V4L2_MBUS_FMT_UYVY8_2X8;

		mf->code = MEDIA_BUS_FMT_UYVY8_2X8;



	mf->colorspace  = V4L2_COLORSPACE_SMPTE170M;

	mf->width       = 0;
@@ -335,11 +335,11 @@ static int adv7175_s_fmt(struct v4l2_subdev *sd, 
	int ret;



	switch (mf->code) {

	case V4L2_MBUS_FMT_UYVY8_2X8:

	case MEDIA_BUS_FMT_UYVY8_2X8:

		val &= ~0x40;

		break;



	case V4L2_MBUS_FMT_UYVY8_1X16:

	case MEDIA_BUS_FMT_UYVY8_1X16:

		val |= 0x40;

		break;

drivers/media/i2c/adv7180.c

+3 −3
Original line number Diff line number Diff line
@@ -422,12 +422,12 @@ static void adv7180_exit_controls(struct adv7180_state *state) 
}



static int adv7180_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned int index,

				 enum v4l2_mbus_pixelcode *code)

				 u32 *code)

{

	if (index > 0)

		return -EINVAL;



	*code = V4L2_MBUS_FMT_YUYV8_2X8;

	*code = MEDIA_BUS_FMT_YUYV8_2X8;



	return 0;

}
@@ -437,7 +437,7 @@ static int adv7180_mbus_fmt(struct v4l2_subdev *sd, 
{

	struct adv7180_state *state = to_state(sd);



	fmt->code = V4L2_MBUS_FMT_YUYV8_2X8;

	fmt->code = MEDIA_BUS_FMT_YUYV8_2X8;

	fmt->colorspace = V4L2_COLORSPACE_SMPTE170M;

	fmt->field = V4L2_FIELD_INTERLACED;

	fmt->width = 720;

drivers/media/i2c/adv7183.c

+3 −3
Original line number Diff line number Diff line
@@ -421,12 +421,12 @@ static int adv7183_g_input_status(struct v4l2_subdev *sd, u32 *status) 
}



static int adv7183_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned index,

				enum v4l2_mbus_pixelcode *code)

				u32 *code)

{

	if (index > 0)

		return -EINVAL;



	*code = V4L2_MBUS_FMT_UYVY8_2X8;

	*code = MEDIA_BUS_FMT_UYVY8_2X8;

	return 0;

}
@@ -435,7 +435,7 @@ static int adv7183_try_mbus_fmt(struct v4l2_subdev *sd, 
{

	struct adv7183 *decoder = to_adv7183(sd);



	fmt->code = V4L2_MBUS_FMT_UYVY8_2X8;

	fmt->code = MEDIA_BUS_FMT_UYVY8_2X8;

	fmt->colorspace = V4L2_COLORSPACE_SMPTE170M;

	if (decoder->std & V4L2_STD_525_60) {

		fmt->field = V4L2_FIELD_SEQ_TB;

drivers/media/i2c/adv7604.c

+36 −36
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ struct adv7604_reg_seq { 
};



struct adv7604_format_info {

	enum v4l2_mbus_pixelcode code;

	u32 code;

	u8 op_ch_sel;

	bool rgb_out;

	bool swap_cb_cr;
@@ -749,77 +749,77 @@ static void adv7604_write_reg_seq(struct v4l2_subdev *sd, 
 */



static const struct adv7604_format_info adv7604_formats[] = {

	{ V4L2_MBUS_FMT_RGB888_1X24, ADV7604_OP_CH_SEL_RGB, true, false,

	{ MEDIA_BUS_FMT_RGB888_1X24, ADV7604_OP_CH_SEL_RGB, true, false,

	  ADV7604_OP_MODE_SEL_SDR_444 | ADV7604_OP_FORMAT_SEL_8BIT },

	{ V4L2_MBUS_FMT_YUYV8_2X8, ADV7604_OP_CH_SEL_RGB, false, false,

	{ MEDIA_BUS_FMT_YUYV8_2X8, ADV7604_OP_CH_SEL_RGB, false, false,

	  ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_8BIT },

	{ V4L2_MBUS_FMT_YVYU8_2X8, ADV7604_OP_CH_SEL_RGB, false, true,

	{ MEDIA_BUS_FMT_YVYU8_2X8, ADV7604_OP_CH_SEL_RGB, false, true,

	  ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_8BIT },

	{ V4L2_MBUS_FMT_YUYV10_2X10, ADV7604_OP_CH_SEL_RGB, false, false,

	{ MEDIA_BUS_FMT_YUYV10_2X10, ADV7604_OP_CH_SEL_RGB, false, false,

	  ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_10BIT },

	{ V4L2_MBUS_FMT_YVYU10_2X10, ADV7604_OP_CH_SEL_RGB, false, true,

	{ MEDIA_BUS_FMT_YVYU10_2X10, ADV7604_OP_CH_SEL_RGB, false, true,

	  ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_10BIT },

	{ V4L2_MBUS_FMT_YUYV12_2X12, ADV7604_OP_CH_SEL_RGB, false, false,

	{ MEDIA_BUS_FMT_YUYV12_2X12, ADV7604_OP_CH_SEL_RGB, false, false,

	  ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_12BIT },

	{ V4L2_MBUS_FMT_YVYU12_2X12, ADV7604_OP_CH_SEL_RGB, false, true,

	{ MEDIA_BUS_FMT_YVYU12_2X12, ADV7604_OP_CH_SEL_RGB, false, true,

	  ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_12BIT },

	{ V4L2_MBUS_FMT_UYVY8_1X16, ADV7604_OP_CH_SEL_RBG, false, false,

	{ MEDIA_BUS_FMT_UYVY8_1X16, ADV7604_OP_CH_SEL_RBG, false, false,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_8BIT },

	{ V4L2_MBUS_FMT_VYUY8_1X16, ADV7604_OP_CH_SEL_RBG, false, true,

	{ MEDIA_BUS_FMT_VYUY8_1X16, ADV7604_OP_CH_SEL_RBG, false, true,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_8BIT },

	{ V4L2_MBUS_FMT_YUYV8_1X16, ADV7604_OP_CH_SEL_RGB, false, false,

	{ MEDIA_BUS_FMT_YUYV8_1X16, ADV7604_OP_CH_SEL_RGB, false, false,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_8BIT },

	{ V4L2_MBUS_FMT_YVYU8_1X16, ADV7604_OP_CH_SEL_RGB, false, true,

	{ MEDIA_BUS_FMT_YVYU8_1X16, ADV7604_OP_CH_SEL_RGB, false, true,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_8BIT },

	{ V4L2_MBUS_FMT_UYVY10_1X20, ADV7604_OP_CH_SEL_RBG, false, false,

	{ MEDIA_BUS_FMT_UYVY10_1X20, ADV7604_OP_CH_SEL_RBG, false, false,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_10BIT },

	{ V4L2_MBUS_FMT_VYUY10_1X20, ADV7604_OP_CH_SEL_RBG, false, true,

	{ MEDIA_BUS_FMT_VYUY10_1X20, ADV7604_OP_CH_SEL_RBG, false, true,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_10BIT },

	{ V4L2_MBUS_FMT_YUYV10_1X20, ADV7604_OP_CH_SEL_RGB, false, false,

	{ MEDIA_BUS_FMT_YUYV10_1X20, ADV7604_OP_CH_SEL_RGB, false, false,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_10BIT },

	{ V4L2_MBUS_FMT_YVYU10_1X20, ADV7604_OP_CH_SEL_RGB, false, true,

	{ MEDIA_BUS_FMT_YVYU10_1X20, ADV7604_OP_CH_SEL_RGB, false, true,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_10BIT },

	{ V4L2_MBUS_FMT_UYVY12_1X24, ADV7604_OP_CH_SEL_RBG, false, false,

	{ MEDIA_BUS_FMT_UYVY12_1X24, ADV7604_OP_CH_SEL_RBG, false, false,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_12BIT },

	{ V4L2_MBUS_FMT_VYUY12_1X24, ADV7604_OP_CH_SEL_RBG, false, true,

	{ MEDIA_BUS_FMT_VYUY12_1X24, ADV7604_OP_CH_SEL_RBG, false, true,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_12BIT },

	{ V4L2_MBUS_FMT_YUYV12_1X24, ADV7604_OP_CH_SEL_RGB, false, false,

	{ MEDIA_BUS_FMT_YUYV12_1X24, ADV7604_OP_CH_SEL_RGB, false, false,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_12BIT },

	{ V4L2_MBUS_FMT_YVYU12_1X24, ADV7604_OP_CH_SEL_RGB, false, true,

	{ MEDIA_BUS_FMT_YVYU12_1X24, ADV7604_OP_CH_SEL_RGB, false, true,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_12BIT },

};



static const struct adv7604_format_info adv7611_formats[] = {

	{ V4L2_MBUS_FMT_RGB888_1X24, ADV7604_OP_CH_SEL_RGB, true, false,

	{ MEDIA_BUS_FMT_RGB888_1X24, ADV7604_OP_CH_SEL_RGB, true, false,

	  ADV7604_OP_MODE_SEL_SDR_444 | ADV7604_OP_FORMAT_SEL_8BIT },

	{ V4L2_MBUS_FMT_YUYV8_2X8, ADV7604_OP_CH_SEL_RGB, false, false,

	{ MEDIA_BUS_FMT_YUYV8_2X8, ADV7604_OP_CH_SEL_RGB, false, false,

	  ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_8BIT },

	{ V4L2_MBUS_FMT_YVYU8_2X8, ADV7604_OP_CH_SEL_RGB, false, true,

	{ MEDIA_BUS_FMT_YVYU8_2X8, ADV7604_OP_CH_SEL_RGB, false, true,

	  ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_8BIT },

	{ V4L2_MBUS_FMT_YUYV12_2X12, ADV7604_OP_CH_SEL_RGB, false, false,

	{ MEDIA_BUS_FMT_YUYV12_2X12, ADV7604_OP_CH_SEL_RGB, false, false,

	  ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_12BIT },

	{ V4L2_MBUS_FMT_YVYU12_2X12, ADV7604_OP_CH_SEL_RGB, false, true,

	{ MEDIA_BUS_FMT_YVYU12_2X12, ADV7604_OP_CH_SEL_RGB, false, true,

	  ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_12BIT },

	{ V4L2_MBUS_FMT_UYVY8_1X16, ADV7604_OP_CH_SEL_RBG, false, false,

	{ MEDIA_BUS_FMT_UYVY8_1X16, ADV7604_OP_CH_SEL_RBG, false, false,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_8BIT },

	{ V4L2_MBUS_FMT_VYUY8_1X16, ADV7604_OP_CH_SEL_RBG, false, true,

	{ MEDIA_BUS_FMT_VYUY8_1X16, ADV7604_OP_CH_SEL_RBG, false, true,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_8BIT },

	{ V4L2_MBUS_FMT_YUYV8_1X16, ADV7604_OP_CH_SEL_RGB, false, false,

	{ MEDIA_BUS_FMT_YUYV8_1X16, ADV7604_OP_CH_SEL_RGB, false, false,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_8BIT },

	{ V4L2_MBUS_FMT_YVYU8_1X16, ADV7604_OP_CH_SEL_RGB, false, true,

	{ MEDIA_BUS_FMT_YVYU8_1X16, ADV7604_OP_CH_SEL_RGB, false, true,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_8BIT },

	{ V4L2_MBUS_FMT_UYVY12_1X24, ADV7604_OP_CH_SEL_RBG, false, false,

	{ MEDIA_BUS_FMT_UYVY12_1X24, ADV7604_OP_CH_SEL_RBG, false, false,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_12BIT },

	{ V4L2_MBUS_FMT_VYUY12_1X24, ADV7604_OP_CH_SEL_RBG, false, true,

	{ MEDIA_BUS_FMT_VYUY12_1X24, ADV7604_OP_CH_SEL_RBG, false, true,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_12BIT },

	{ V4L2_MBUS_FMT_YUYV12_1X24, ADV7604_OP_CH_SEL_RGB, false, false,

	{ MEDIA_BUS_FMT_YUYV12_1X24, ADV7604_OP_CH_SEL_RGB, false, false,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_12BIT },

	{ V4L2_MBUS_FMT_YVYU12_1X24, ADV7604_OP_CH_SEL_RGB, false, true,

	{ MEDIA_BUS_FMT_YVYU12_1X24, ADV7604_OP_CH_SEL_RGB, false, true,

	  ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_12BIT },

};



static const struct adv7604_format_info *

adv7604_format_info(struct adv7604_state *state, enum v4l2_mbus_pixelcode code)

adv7604_format_info(struct adv7604_state *state, u32 code)

{

	unsigned int i;
@@ -1917,7 +1917,7 @@ static int adv7604_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 


	info = adv7604_format_info(state, format->format.code);

	if (info == NULL)

		info = adv7604_format_info(state, V4L2_MBUS_FMT_YUYV8_2X8);

		info = adv7604_format_info(state, MEDIA_BUS_FMT_YUYV8_2X8);



	adv7604_fill_format(state, &format->format);

	format->format.code = info->code;
@@ -2806,7 +2806,7 @@ static int adv7604_probe(struct i2c_client *client, 
	}



	state->timings = cea640x480;

	state->format = adv7604_format_info(state, V4L2_MBUS_FMT_YUYV8_2X8);

	state->format = adv7604_format_info(state, MEDIA_BUS_FMT_YUYV8_2X8);



	sd = &state->sd;

	v4l2_i2c_subdev_init(sd, client, &adv7604_ops);

CRA Git | Maintained and supported by SUSTech CRA and CCSE