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

Commit 7aaad131 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] vpif_capture: move routing info from subdev to input 



Routing information is a property of the input, not of the subdev.
One subdev may provide multiple inputs, each with its own routing
information.

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 33bf1786

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

+6 −4
Original line number Diff line number Diff line
@@ -1182,8 +1182,11 @@ static const struct vpif_input da850_ch0_inputs[] = { 
			.index = 0,

			.name  = "Composite",

			.type  = V4L2_INPUT_TYPE_CAMERA,

			.capabilities = V4L2_IN_CAP_STD,

			.std   = TVP514X_STD_ALL,

		},

		.input_route = INPUT_CVBS_VI2B,

		.output_route = OUTPUT_10BIT_422_EMBEDDED_SYNC,

		.subdev_name = TVP5147_CH0,

	},

};
@@ -1194,8 +1197,11 @@ static const struct vpif_input da850_ch1_inputs[] = { 
			.index = 0,

			.name  = "S-Video",

			.type  = V4L2_INPUT_TYPE_CAMERA,

			.capabilities = V4L2_IN_CAP_STD,

			.std   = TVP514X_STD_ALL,

		},

		.input_route = INPUT_SVIDEO_VI2C_VI1C,

		.output_route = OUTPUT_10BIT_422_EMBEDDED_SYNC,

		.subdev_name = TVP5147_CH1,

	},

};
@@ -1207,8 +1213,6 @@ static struct vpif_subdev_info da850_vpif_capture_sdev_info[] = { 
			I2C_BOARD_INFO("tvp5146", 0x5d),

			.platform_data = &tvp5146_pdata,

		},

		.input = INPUT_CVBS_VI2B,

		.output = OUTPUT_10BIT_422_EMBEDDED_SYNC,

		.vpif_if = {

			.if_type = VPIF_IF_BT656,

			.hd_pol  = 1,
@@ -1222,8 +1226,6 @@ static struct vpif_subdev_info da850_vpif_capture_sdev_info[] = { 
			I2C_BOARD_INFO("tvp5146", 0x5c),

			.platform_data = &tvp5146_pdata,

		},

		.input = INPUT_SVIDEO_VI2C_VI1C,

		.output = OUTPUT_10BIT_422_EMBEDDED_SYNC,

		.vpif_if = {

			.if_type = VPIF_IF_BT656,

			.hd_pol  = 1,

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

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

			.platform_data = &tvp5146_pdata,

		},

		.input = INPUT_CVBS_VI2B,

		.output = OUTPUT_10BIT_422_EMBEDDED_SYNC,

		.vpif_if = {

			.if_type = VPIF_IF_BT656,

			.hd_pol = 1,
@@ -616,8 +614,6 @@ static struct vpif_subdev_info vpif_capture_sdev_info[] = { 
			I2C_BOARD_INFO("tvp5146", 0x5c),

			.platform_data = &tvp5146_pdata,

		},

		.input = INPUT_SVIDEO_VI2C_VI1C,

		.output = OUTPUT_10BIT_422_EMBEDDED_SYNC,

		.vpif_if = {

			.if_type = VPIF_IF_BT656,

			.hd_pol = 1,
@@ -633,9 +629,12 @@ static const struct vpif_input dm6467_ch0_inputs[] = { 
			.index = 0,

			.name = "Composite",

			.type = V4L2_INPUT_TYPE_CAMERA,

			.capabilities = V4L2_IN_CAP_STD,

			.std = TVP514X_STD_ALL,

		},

		.subdev_name = TVP5147_CH0,

		.input_route = INPUT_CVBS_VI2B,

		.output_route = OUTPUT_10BIT_422_EMBEDDED_SYNC,

	},

};
@@ -645,9 +644,12 @@ static const struct vpif_input dm6467_ch1_inputs[] = { 
			.index = 0,

			.name = "S-Video",

			.type = V4L2_INPUT_TYPE_CAMERA,

			.capabilities = V4L2_IN_CAP_STD,

			.std = TVP514X_STD_ALL,

		},

		.subdev_name = TVP5147_CH1,

		.input_route = INPUT_SVIDEO_VI2C_VI1C,

		.output_route = OUTPUT_10BIT_422_EMBEDDED_SYNC,

	},

};

drivers/media/platform/davinci/vpif_capture.c

+5 −2
Original line number Diff line number Diff line
@@ -1464,6 +1464,9 @@ static int vpif_s_input(struct file *file, void *priv, unsigned int index) 


	chan_cfg = &config->chan_config[ch->channel_id];



	if (index >= chan_cfg->input_count)

		return -EINVAL;



	if (common->started) {

		vpif_err("Streaming in progress\n");

		return -EBUSY;
@@ -1502,8 +1505,8 @@ static int vpif_s_input(struct file *file, void *priv, unsigned int index) 
		}

	}



	input = subdev_info->input;

	output = subdev_info->output;

	input = chan_cfg->inputs[index].input_route;

	output = chan_cfg->inputs[index].output_route;

	ret = v4l2_subdev_call(vpif_obj.sd[sd_index], video, s_routing,

			input, output, 0);

	if (ret < 0 && ret != -ENOIOCTLCMD) {

include/media/davinci/vpif_types.h

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ struct vpif_interface { 
struct vpif_subdev_info {

	const char *name;

	struct i2c_board_info board_info;

	u32 input;

	u32 output;

	struct vpif_interface vpif_if;

};
@@ -56,6 +54,8 @@ struct vpif_display_config { 
struct vpif_input {

	struct v4l2_input input;

	const char *subdev_name;

	u32 input_route;

	u32 output_route;

};



struct vpif_capture_chan_config {