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

[media] platform: Make use of media_bus_format enum 



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

Reference new definitions in all platform 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 avatarSekhar Nori <nsekhar@ti.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 43ba4641

Documentation/video4linux/soc-camera.txt

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ they are transferred over a media bus. Soc-camera provides support to 
conveniently manage these formats. A table of standard transformations is

maintained by soc-camera core, which describes, what FOURCC pixel format will

be obtained, if a media-bus pixel format is stored in memory according to

certain rules. E.g. if V4L2_MBUS_FMT_YUYV8_2X8 data is sampled with 8 bits per

certain rules. E.g. if MEDIA_BUS_FMT_YUYV8_2X8 data is sampled with 8 bits per

sample and stored in memory in the little-endian order with no gaps between

bytes, data in memory will represent the V4L2_PIX_FMT_YUYV FOURCC format. These

standard transformations will be used by soc-camera or by camera host drivers to

arch/arm/mach-davinci/board-dm355-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static struct vpbe_output dm355evm_vpbe_outputs[] = { 
		.default_mode	= "ntsc",

		.num_modes	= ARRAY_SIZE(dm355evm_enc_preset_timing),

		.modes		= dm355evm_enc_preset_timing,

		.if_params	= V4L2_MBUS_FMT_FIXED,

		.if_params	= MEDIA_BUS_FMT_FIXED,

	},

};

arch/arm/mach-davinci/board-dm365-evm.c

+2 −2
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ static struct vpbe_output dm365evm_vpbe_outputs[] = { 
		.default_mode	= "ntsc",

		.num_modes	= ARRAY_SIZE(dm365evm_enc_std_timing),

		.modes		= dm365evm_enc_std_timing,

		.if_params	= V4L2_MBUS_FMT_FIXED,

		.if_params	= MEDIA_BUS_FMT_FIXED,

	},

	{

		.output		= {
@@ -498,7 +498,7 @@ static struct vpbe_output dm365evm_vpbe_outputs[] = { 
		.default_mode	= "480p59_94",

		.num_modes	= ARRAY_SIZE(dm365evm_enc_preset_timing),

		.modes		= dm365evm_enc_preset_timing,

		.if_params	= V4L2_MBUS_FMT_FIXED,

		.if_params	= MEDIA_BUS_FMT_FIXED,

	},

};

arch/arm/mach-davinci/dm355.c

+3 −4
Original line number Diff line number Diff line
@@ -785,14 +785,13 @@ static struct resource dm355_v4l2_disp_resources[] = { 
	},

};



static int dm355_vpbe_setup_pinmux(enum v4l2_mbus_pixelcode if_type,

			    int field)

static int dm355_vpbe_setup_pinmux(u32 if_type, int field)

{

	switch (if_type) {

	case V4L2_MBUS_FMT_SGRBG8_1X8:

	case MEDIA_BUS_FMT_SGRBG8_1X8:

		davinci_cfg_reg(DM355_VOUT_FIELD_G70);

		break;

	case V4L2_MBUS_FMT_YUYV10_1X20:

	case MEDIA_BUS_FMT_YUYV10_1X20:

		if (field)

			davinci_cfg_reg(DM355_VOUT_FIELD);

		else

arch/arm/mach-davinci/dm365.c

+3 −4
Original line number Diff line number Diff line
@@ -1306,16 +1306,15 @@ static struct resource dm365_v4l2_disp_resources[] = { 
	},

};



static int dm365_vpbe_setup_pinmux(enum v4l2_mbus_pixelcode if_type,

			    int field)

static int dm365_vpbe_setup_pinmux(u32 if_type, int field)

{

	switch (if_type) {

	case V4L2_MBUS_FMT_SGRBG8_1X8:

	case MEDIA_BUS_FMT_SGRBG8_1X8:

		davinci_cfg_reg(DM365_VOUT_FIELD_G81);

		davinci_cfg_reg(DM365_VOUT_COUTL_EN);

		davinci_cfg_reg(DM365_VOUT_COUTH_EN);

		break;

	case V4L2_MBUS_FMT_YUYV10_1X20:

	case MEDIA_BUS_FMT_YUYV10_1X20:

		if (field)

			davinci_cfg_reg(DM365_VOUT_FIELD);

		else

CRA Git | Maintained and supported by SUSTech CRA and CCSE