Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d4f35f3 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] davinci: move struct vpif_interface to chan_cfg 



struct vpif_interface is channel specific, not subdev specific.
Move it to the channel config.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarSekhar Nori <nsekhar@ti.com>
Acked-by: default avatarLad, Prabhakar <prabhakar.lad@ti.com>
Tested-by: default avatarLad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 882084ad

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

+12 −12
Original line number Diff line number Diff line
@@ -1213,12 +1213,6 @@ static struct vpif_subdev_info da850_vpif_capture_sdev_info[] = { 
			I2C_BOARD_INFO("tvp5146", 0x5d),

			.platform_data = &tvp5146_pdata,

		},

		.vpif_if = {

			.if_type = VPIF_IF_BT656,

			.hd_pol  = 1,

			.vd_pol  = 1,

			.fid_pol = 0,

		},

	},

	{

		.name = TVP5147_CH1,
@@ -1226,12 +1220,6 @@ static struct vpif_subdev_info da850_vpif_capture_sdev_info[] = { 
			I2C_BOARD_INFO("tvp5146", 0x5c),

			.platform_data = &tvp5146_pdata,

		},

		.vpif_if = {

			.if_type = VPIF_IF_BT656,

			.hd_pol  = 1,

			.vd_pol  = 1,

			.fid_pol = 0,

		},

	},

};
@@ -1241,10 +1229,22 @@ static struct vpif_capture_config da850_vpif_capture_config = { 
	.chan_config[0] = {

		.inputs = da850_ch0_inputs,

		.input_count = ARRAY_SIZE(da850_ch0_inputs),

		.vpif_if = {

			.if_type = VPIF_IF_BT656,

			.hd_pol  = 1,

			.vd_pol  = 1,

			.fid_pol = 0,

		},

	},

	.chan_config[1] = {

		.inputs = da850_ch1_inputs,

		.input_count = ARRAY_SIZE(da850_ch1_inputs),

		.vpif_if = {

			.if_type = VPIF_IF_BT656,

			.hd_pol  = 1,

			.vd_pol  = 1,

			.fid_pol = 0,

		},

	},

	.card_name = "DA850/OMAP-L138 Video Capture",

};

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

+12 −12
Original line number Diff line number Diff line
@@ -601,12 +601,6 @@ static struct vpif_subdev_info vpif_capture_sdev_info[] = { 
			I2C_BOARD_INFO("tvp5146", 0x5d),

			.platform_data = &tvp5146_pdata,

		},

		.vpif_if = {

			.if_type = VPIF_IF_BT656,

			.hd_pol = 1,

			.vd_pol = 1,

			.fid_pol = 0,

		},

	},

	{

		.name	= TVP5147_CH1,
@@ -614,12 +608,6 @@ static struct vpif_subdev_info vpif_capture_sdev_info[] = { 
			I2C_BOARD_INFO("tvp5146", 0x5c),

			.platform_data = &tvp5146_pdata,

		},

		.vpif_if = {

			.if_type = VPIF_IF_BT656,

			.hd_pol = 1,

			.vd_pol = 1,

			.fid_pol = 0,

		},

	},

};
@@ -661,10 +649,22 @@ static struct vpif_capture_config dm646x_vpif_capture_cfg = { 
	.chan_config[0] = {

		.inputs = dm6467_ch0_inputs,

		.input_count = ARRAY_SIZE(dm6467_ch0_inputs),

		.vpif_if = {

			.if_type = VPIF_IF_BT656,

			.hd_pol = 1,

			.vd_pol = 1,

			.fid_pol = 0,

		},

	},

	.chan_config[1] = {

		.inputs = dm6467_ch1_inputs,

		.input_count = ARRAY_SIZE(dm6467_ch1_inputs),

		.vpif_if = {

			.if_type = VPIF_IF_BT656,

			.hd_pol = 1,

			.vd_pol = 1,

			.fid_pol = 0,

		},

	},

};

drivers/media/platform/davinci/vpif_capture.c

+1 −1
Original line number Diff line number Diff line
@@ -1310,7 +1310,7 @@ static int vpif_set_input( 
	ch->input_idx = index;

	ch->sd = sd;

	/* copy interface parameters to vpif */

	ch->vpifparams.iface = subdev_info->vpif_if;

	ch->vpifparams.iface = chan_cfg->vpif_if;



	/* update tvnorms from the sub device input info */

	ch->video_dev->tvnorms = chan_cfg->inputs[index].input.std;

include/media/davinci/vpif_types.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ struct vpif_interface { 
struct vpif_subdev_info {

	const char *name;

	struct i2c_board_info board_info;

	struct vpif_interface vpif_if;

};



struct vpif_display_config {
@@ -59,6 +58,7 @@ struct vpif_input { 
};



struct vpif_capture_chan_config {

	struct vpif_interface vpif_if;

	const struct vpif_input *inputs;

	int input_count;

};