2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Jon Povey <jon.po...@racelogic.co.uk> [ upstream commit 9daedd833a38edd90cf7baa1b1fcf61c3a0721e3 ] Video input mux settings for tvp7002 and imager inputs were swapped. Comment was correct. Tested on EVM with tvp7002 input. Signed-off-by: Jon Povey <jon.po...@racelogic.co.uk> Acked-by: Manjunath Hadli <manjunath.ha...@ti.com> Cc: sta...@kernel.org Signed-off-by: Sekhar Nori <nsek...@ti.com> Signed-off-by: Andi Kleen <a...@linux.intel.com> Index: linux-2.6.35.y/arch/arm/mach-davinci/board-dm365-evm.c =================================================================== --- linux-2.6.35.y.orig/arch/arm/mach-davinci/board-dm365-evm.c +++ linux-2.6.35.y/arch/arm/mach-davinci/board-dm365-evm.c @@ -520,7 +520,7 @@ fail: */ if (have_imager()) { label = "HD imager"; - mux |= 1; + mux |= 2; /* externally mux MMC1/ENET/AIC33 to imager */ mux |= BIT(6) | BIT(5) | BIT(3); @@ -541,7 +541,7 @@ fail: resets &= ~BIT(1); if (have_tvp7002()) { - mux |= 2; + mux |= 1; resets &= ~BIT(2); label = "tvp7002 HD"; } else { _______________________________________________ stable mailing list stable@linux.kernel.org http://linux.kernel.org/mailman/listinfo/stable