diff options
Diffstat (limited to 'arch/arm/mach-davinci/dm644x.c')
-rw-r--r-- | arch/arm/mach-davinci/dm644x.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index cd0c8b1e1ecf..11c79a3362ef 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c | |||
@@ -713,8 +713,7 @@ static int dm644x_venc_setup_clock(enum vpbe_enc_timings_type type, | |||
713 | break; | 713 | break; |
714 | case VPBE_ENC_CUSTOM_TIMINGS: | 714 | case VPBE_ENC_CUSTOM_TIMINGS: |
715 | if (pclock <= 27000000) { | 715 | if (pclock <= 27000000) { |
716 | v |= DM644X_VPSS_MUXSEL_PLL2_MODE | | 716 | v |= DM644X_VPSS_DACCLKEN; |
717 | DM644X_VPSS_DACCLKEN; | ||
718 | writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL)); | 717 | writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL)); |
719 | } else { | 718 | } else { |
720 | /* | 719 | /* |
@@ -786,12 +785,6 @@ static struct map_desc dm644x_io_desc[] = { | |||
786 | .length = IO_SIZE, | 785 | .length = IO_SIZE, |
787 | .type = MT_DEVICE | 786 | .type = MT_DEVICE |
788 | }, | 787 | }, |
789 | { | ||
790 | .virtual = SRAM_VIRT, | ||
791 | .pfn = __phys_to_pfn(0x00008000), | ||
792 | .length = SZ_16K, | ||
793 | .type = MT_MEMORY_NONCACHED, | ||
794 | }, | ||
795 | }; | 788 | }; |
796 | 789 | ||
797 | /* Contents of JTAG ID register used to identify exact cpu type */ | 790 | /* Contents of JTAG ID register used to identify exact cpu type */ |