Commit b3055556 authored by Olof Johansson's avatar Olof Johansson
Browse files

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
parents f4a75d2e e37212aa
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -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 {
			/*