tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab ef2d41b1 4bd3bb71

+13 -14
+2 -2
arch/arm/mach-davinci/board-dm644x-evm.c
··· 649 649 static struct vpbe_enc_mode_info dm644xevm_enc_preset_timing[] = { 650 650 { 651 651 .name = "480p59_94", 652 - .timings_type = VPBE_ENC_CUSTOM_TIMINGS, 652 + .timings_type = VPBE_ENC_DV_TIMINGS, 653 653 .dv_timings = V4L2_DV_BT_CEA_720X480P59_94, 654 654 .interlaced = 0, 655 655 .xres = 720, ··· 661 661 }, 662 662 { 663 663 .name = "576p50", 664 - .timings_type = VPBE_ENC_CUSTOM_TIMINGS, 664 + .timings_type = VPBE_ENC_DV_TIMINGS, 665 665 .dv_timings = V4L2_DV_BT_CEA_720X576P50, 666 666 .interlaced = 0, 667 667 .xres = 720,
+1 -1
arch/arm/mach-davinci/dm644x.c
··· 706 706 v |= DM644X_VPSS_DACCLKEN; 707 707 writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL)); 708 708 break; 709 - case VPBE_ENC_CUSTOM_TIMINGS: 709 + case VPBE_ENC_DV_TIMINGS: 710 710 if (pclock <= 27000000) { 711 711 v |= DM644X_VPSS_DACCLKEN; 712 712 writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL));
+4 -4
drivers/media/platform/davinci/vpbe.c
··· 344 344 return -EINVAL; 345 345 346 346 for (i = 0; i < output->num_modes; i++) { 347 - if (output->modes[i].timings_type == VPBE_ENC_CUSTOM_TIMINGS && 347 + if (output->modes[i].timings_type == VPBE_ENC_DV_TIMINGS && 348 348 !memcmp(&output->modes[i].dv_timings, 349 349 dv_timings, sizeof(*dv_timings))) 350 350 break; ··· 385 385 struct v4l2_dv_timings *dv_timings) 386 386 { 387 387 if (vpbe_dev->current_timings.timings_type & 388 - VPBE_ENC_CUSTOM_TIMINGS) { 388 + VPBE_ENC_DV_TIMINGS) { 389 389 *dv_timings = vpbe_dev->current_timings.dv_timings; 390 390 return 0; 391 391 } ··· 412 412 return -EINVAL; 413 413 414 414 for (i = 0; i < output->num_modes; i++) { 415 - if (output->modes[i].timings_type == VPBE_ENC_CUSTOM_TIMINGS) { 415 + if (output->modes[i].timings_type == VPBE_ENC_DV_TIMINGS) { 416 416 if (j == timings->index) 417 417 break; 418 418 j++; ··· 515 515 return vpbe_s_std(vpbe_dev, 516 516 &preset_mode->std_id); 517 517 if (preset_mode->timings_type & 518 - VPBE_ENC_CUSTOM_TIMINGS) { 518 + VPBE_ENC_DV_TIMINGS) { 519 519 dv_timings = 520 520 preset_mode->dv_timings; 521 521 return vpbe_s_dv_timings(vpbe_dev, &dv_timings);
+1 -1
drivers/media/platform/davinci/vpbe_display.c
··· 1202 1202 /* Get the given standard in the encoder */ 1203 1203 1204 1204 if (vpbe_dev->current_timings.timings_type & 1205 - VPBE_ENC_CUSTOM_TIMINGS) { 1205 + VPBE_ENC_DV_TIMINGS) { 1206 1206 *dv_timings = vpbe_dev->current_timings.dv_timings; 1207 1207 } else { 1208 1208 return -EINVAL;
+4 -4
drivers/media/platform/davinci/vpbe_venc.c
··· 313 313 return -EINVAL; 314 314 315 315 /* Setup clock at VPSS & VENC for SD */ 316 - if (pdata->setup_clock(VPBE_ENC_CUSTOM_TIMINGS, 27000000) < 0) 316 + if (pdata->setup_clock(VPBE_ENC_DV_TIMINGS, 27000000) < 0) 317 317 return -EINVAL; 318 318 319 319 venc_enabledigitaloutput(sd, 0); ··· 360 360 venc->venc_type != VPBE_VERSION_2) 361 361 return -EINVAL; 362 362 /* Setup clock at VPSS & VENC for SD */ 363 - if (pdata->setup_clock(VPBE_ENC_CUSTOM_TIMINGS, 27000000) < 0) 363 + if (pdata->setup_clock(VPBE_ENC_DV_TIMINGS, 27000000) < 0) 364 364 return -EINVAL; 365 365 366 366 venc_enabledigitaloutput(sd, 0); ··· 400 400 struct venc_state *venc = to_state(sd); 401 401 struct venc_platform_data *pdata = venc->pdata; 402 402 403 - if (pdata->setup_clock(VPBE_ENC_CUSTOM_TIMINGS, 74250000) < 0) 403 + if (pdata->setup_clock(VPBE_ENC_DV_TIMINGS, 74250000) < 0) 404 404 return -EINVAL; 405 405 406 406 venc_enabledigitaloutput(sd, 0); ··· 428 428 struct venc_state *venc = to_state(sd); 429 429 struct venc_platform_data *pdata = venc->pdata; 430 430 431 - if (pdata->setup_clock(VPBE_ENC_CUSTOM_TIMINGS, 74250000) < 0) 431 + if (pdata->setup_clock(VPBE_ENC_DV_TIMINGS, 74250000) < 0) 432 432 return -EINVAL; 433 433 434 434 venc_enabledigitaloutput(sd, 0);
+1 -2
include/media/davinci/vpbe_types.h
··· 26 26 /* vpbe_timing_type - Timing types used in vpbe device */ 27 27 enum vpbe_enc_timings_type { 28 28 VPBE_ENC_STD = 0x1, 29 - VPBE_ENC_DV_PRESET = 0x2, 30 - VPBE_ENC_CUSTOM_TIMINGS = 0x4, 29 + VPBE_ENC_DV_TIMINGS = 0x4, 31 30 /* Used when set timings through FB device interface */ 32 31 VPBE_ENC_TIMINGS_INVALID = 0x8, 33 32 };