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

[media] davinci: remove VPBE_ENC_DV_PRESET and rename VPBE_ENC_CUSTOM_TIMINGS 



Remove VPBE_ENC_DV_PRESET (the DV_PRESET API is no longer supported) and
VPBE_ENC_CUSTOM_TIMINGS is renamed to VPBE_ENC_DV_TIMINGS since the old
"CUSTOM_TIMINGS" name is deprecated in favor of "DV_TIMINGS".

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

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

+2 −2
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = { 
static struct vpbe_enc_mode_info dm644xevm_enc_preset_timing[] = {

	{

		.name		= "480p59_94",

		.timings_type	= VPBE_ENC_CUSTOM_TIMINGS,

		.timings_type	= VPBE_ENC_DV_TIMINGS,

		.dv_timings	= V4L2_DV_BT_CEA_720X480P59_94,

		.interlaced	= 0,

		.xres		= 720,
@@ -661,7 +661,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_preset_timing[] = { 
	},

	{

		.name		= "576p50",

		.timings_type	= VPBE_ENC_CUSTOM_TIMINGS,

		.timings_type	= VPBE_ENC_DV_TIMINGS,

		.dv_timings	= V4L2_DV_BT_CEA_720X576P50,

		.interlaced	= 0,

		.xres		= 720,

arch/arm/mach-davinci/dm644x.c

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ static int dm644x_venc_setup_clock(enum vpbe_enc_timings_type type, 
		v |= DM644X_VPSS_DACCLKEN;

		writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL));

		break;

	case VPBE_ENC_CUSTOM_TIMINGS:

	case VPBE_ENC_DV_TIMINGS:

		if (pclock <= 27000000) {

			v |= DM644X_VPSS_DACCLKEN;

			writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL));

drivers/media/platform/davinci/vpbe.c

+4 −4
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static int vpbe_s_dv_timings(struct vpbe_device *vpbe_dev, 
		return -EINVAL;



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

		if (output->modes[i].timings_type == VPBE_ENC_CUSTOM_TIMINGS &&

		if (output->modes[i].timings_type == VPBE_ENC_DV_TIMINGS &&

		    !memcmp(&output->modes[i].dv_timings,

				dv_timings, sizeof(*dv_timings)))

			break;
@@ -385,7 +385,7 @@ static int vpbe_g_dv_timings(struct vpbe_device *vpbe_dev, 
		     struct v4l2_dv_timings *dv_timings)

{

	if (vpbe_dev->current_timings.timings_type &

	  VPBE_ENC_CUSTOM_TIMINGS) {

	  VPBE_ENC_DV_TIMINGS) {

		*dv_timings = vpbe_dev->current_timings.dv_timings;

		return 0;

	}
@@ -412,7 +412,7 @@ static int vpbe_enum_dv_timings(struct vpbe_device *vpbe_dev, 
		return -EINVAL;



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

		if (output->modes[i].timings_type == VPBE_ENC_CUSTOM_TIMINGS) {

		if (output->modes[i].timings_type == VPBE_ENC_DV_TIMINGS) {

			if (j == timings->index)

				break;

			j++;
@@ -515,7 +515,7 @@ static int vpbe_set_mode(struct vpbe_device *vpbe_dev, 
				return vpbe_s_std(vpbe_dev,

						 &preset_mode->std_id);

			if (preset_mode->timings_type &

						VPBE_ENC_CUSTOM_TIMINGS) {

						VPBE_ENC_DV_TIMINGS) {

				dv_timings =

					preset_mode->dv_timings;

				return vpbe_s_dv_timings(vpbe_dev, &dv_timings);

drivers/media/platform/davinci/vpbe_display.c

+1 −1
Original line number Diff line number Diff line
@@ -1202,7 +1202,7 @@ vpbe_display_g_dv_timings(struct file *file, void *priv, 
	/* Get the given standard in the encoder */



	if (vpbe_dev->current_timings.timings_type &

				VPBE_ENC_CUSTOM_TIMINGS) {

				VPBE_ENC_DV_TIMINGS) {

		*dv_timings = vpbe_dev->current_timings.dv_timings;

	} else {

		return -EINVAL;

drivers/media/platform/davinci/vpbe_venc.c

+4 −4
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static int venc_set_480p59_94(struct v4l2_subdev *sd) 
		return -EINVAL;



	/* Setup clock at VPSS & VENC for SD */

	if (pdata->setup_clock(VPBE_ENC_CUSTOM_TIMINGS, 27000000) < 0)

	if (pdata->setup_clock(VPBE_ENC_DV_TIMINGS, 27000000) < 0)

		return -EINVAL;



	venc_enabledigitaloutput(sd, 0);
@@ -360,7 +360,7 @@ static int venc_set_576p50(struct v4l2_subdev *sd) 
	    venc->venc_type != VPBE_VERSION_2)

		return -EINVAL;

	/* Setup clock at VPSS & VENC for SD */

	if (pdata->setup_clock(VPBE_ENC_CUSTOM_TIMINGS, 27000000) < 0)

	if (pdata->setup_clock(VPBE_ENC_DV_TIMINGS, 27000000) < 0)

		return -EINVAL;



	venc_enabledigitaloutput(sd, 0);
@@ -400,7 +400,7 @@ static int venc_set_720p60_internal(struct v4l2_subdev *sd) 
	struct venc_state *venc = to_state(sd);

	struct venc_platform_data *pdata = venc->pdata;



	if (pdata->setup_clock(VPBE_ENC_CUSTOM_TIMINGS, 74250000) < 0)

	if (pdata->setup_clock(VPBE_ENC_DV_TIMINGS, 74250000) < 0)

		return -EINVAL;



	venc_enabledigitaloutput(sd, 0);
@@ -428,7 +428,7 @@ static int venc_set_1080i30_internal(struct v4l2_subdev *sd) 
	struct venc_state *venc = to_state(sd);

	struct venc_platform_data *pdata = venc->pdata;



	if (pdata->setup_clock(VPBE_ENC_CUSTOM_TIMINGS, 74250000) < 0)

	if (pdata->setup_clock(VPBE_ENC_DV_TIMINGS, 74250000) < 0)

		return -EINVAL;



	venc_enabledigitaloutput(sd, 0);