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

Commit e32087bc authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab
Browse files

[media] davinci: vpbe: replace V4L2_OUT_CAP_CUSTOM_TIMINGS with V4L2_OUT_CAP_DV_TIMINGS 



This patch replaces V4L2_OUT_CAP_CUSTOM_TIMINGS macro with
V4L2_OUT_CAP_DV_TIMINGS. As V4L2_OUT_CAP_CUSTOM_TIMINGS is being phased
out.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ static struct vpbe_output dm644xevm_vpbe_outputs[] = { 
			.index		= 1,

			.name		= "Component",

			.type		= V4L2_OUTPUT_TYPE_ANALOG,

			.capabilities	= V4L2_OUT_CAP_CUSTOM_TIMINGS,

			.capabilities	= V4L2_OUT_CAP_DV_TIMINGS,

		},

		.subdev_name	= VPBE_VENC_SUBDEV_NAME,

		.default_mode	= "480p59_94",

drivers/media/platform/davinci/vpbe.c

+2 −2
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static int vpbe_s_dv_timings(struct vpbe_device *vpbe_dev, 




	if (!(cfg->outputs[out_index].output.capabilities &

	    V4L2_OUT_CAP_CUSTOM_TIMINGS))

	    V4L2_OUT_CAP_DV_TIMINGS))

		return -EINVAL;



	for (i = 0; i < output->num_modes; i++) {
@@ -408,7 +408,7 @@ static int vpbe_enum_dv_timings(struct vpbe_device *vpbe_dev, 
	int j = 0;

	int i;



	if (!(output->output.capabilities & V4L2_OUT_CAP_CUSTOM_TIMINGS))

	if (!(output->output.capabilities & V4L2_OUT_CAP_DV_TIMINGS))

		return -EINVAL;



	for (i = 0; i < output->num_modes; i++) {