diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-19 20:48:42 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-19 20:48:42 +0400 |
| commit | b3055556fc349b23f09e2c374054a4a80571169c (patch) | |
| tree | 4f597b5c4c2964f8485e257035b78d4f7f509274 | |
| parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
| parent | e37212aa5df1937bc19c0d0982d216675020a7ca (diff) | |
| download | linux-b3055556fc349b23f09e2c374054a4a80571169c.tar.xz | |
Merge tag 'davinci-fixes-for-v3.7' of git://gitorious.org/linux-davinci/linux-davinci into fixes
From Sekhar Nori:
Fixes an "signal out of range" error when using enhanced
definition display with a DaVinci DM644x device.
* tag 'davinci-fixes-for-v3.7' of git://gitorious.org/linux-davinci/linux-davinci:
ARM: davinci: dm644x: fix out range signal for ED
| -rw-r--r-- | arch/arm/mach-davinci/dm644x.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index cd0c8b1e1ecf..14e9947bad6e 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, break; case VPBE_ENC_CUSTOM_TIMINGS: if (pclock <= 27000000) { - v |= DM644X_VPSS_MUXSEL_PLL2_MODE | - DM644X_VPSS_DACCLKEN; + v |= DM644X_VPSS_DACCLKEN; writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL)); } else { /* |