diff options
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r-- | arch/arm/mach-davinci/board-dm644x-evm.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-dm646x-evm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/dm644x.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index 71735e7797cc..a02180052a76 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c | |||
@@ -649,7 +649,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = { | |||
649 | static struct vpbe_enc_mode_info dm644xevm_enc_preset_timing[] = { | 649 | static struct vpbe_enc_mode_info dm644xevm_enc_preset_timing[] = { |
650 | { | 650 | { |
651 | .name = "480p59_94", | 651 | .name = "480p59_94", |
652 | .timings_type = VPBE_ENC_CUSTOM_TIMINGS, | 652 | .timings_type = VPBE_ENC_DV_TIMINGS, |
653 | .dv_timings = V4L2_DV_BT_CEA_720X480P59_94, | 653 | .dv_timings = V4L2_DV_BT_CEA_720X480P59_94, |
654 | .interlaced = 0, | 654 | .interlaced = 0, |
655 | .xres = 720, | 655 | .xres = 720, |
@@ -661,7 +661,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_preset_timing[] = { | |||
661 | }, | 661 | }, |
662 | { | 662 | { |
663 | .name = "576p50", | 663 | .name = "576p50", |
664 | .timings_type = VPBE_ENC_CUSTOM_TIMINGS, | 664 | .timings_type = VPBE_ENC_DV_TIMINGS, |
665 | .dv_timings = V4L2_DV_BT_CEA_720X576P50, | 665 | .dv_timings = V4L2_DV_BT_CEA_720X576P50, |
666 | .interlaced = 0, | 666 | .interlaced = 0, |
667 | .xres = 720, | 667 | .xres = 720, |
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index de7adff324dc..fc4871ac1c2c 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c | |||
@@ -514,7 +514,7 @@ static const struct vpif_output dm6467_ch0_outputs[] = { | |||
514 | .index = 1, | 514 | .index = 1, |
515 | .name = "Component", | 515 | .name = "Component", |
516 | .type = V4L2_OUTPUT_TYPE_ANALOG, | 516 | .type = V4L2_OUTPUT_TYPE_ANALOG, |
517 | .capabilities = V4L2_OUT_CAP_CUSTOM_TIMINGS, | 517 | .capabilities = V4L2_OUT_CAP_DV_TIMINGS, |
518 | }, | 518 | }, |
519 | .subdev_name = "adv7343", | 519 | .subdev_name = "adv7343", |
520 | .output_route = ADV7343_COMPONENT_ID, | 520 | .output_route = ADV7343_COMPONENT_ID, |
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index db1dd92e00af..ee0e994748e0 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c | |||
@@ -706,7 +706,7 @@ static int dm644x_venc_setup_clock(enum vpbe_enc_timings_type type, | |||
706 | v |= DM644X_VPSS_DACCLKEN; | 706 | v |= DM644X_VPSS_DACCLKEN; |
707 | writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL)); | 707 | writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL)); |
708 | break; | 708 | break; |
709 | case VPBE_ENC_CUSTOM_TIMINGS: | 709 | case VPBE_ENC_DV_TIMINGS: |
710 | if (pclock <= 27000000) { | 710 | if (pclock <= 27000000) { |
711 | v |= DM644X_VPSS_DACCLKEN; | 711 | v |= DM644X_VPSS_DACCLKEN; |
712 | writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL)); | 712 | writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL)); |