diff options
| author | Jon Povey <jon.povey@racelogic.co.uk> | 2011-07-19 12:30:11 +0900 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2011-08-01 13:55:01 -0700 |
| commit | 5671ba64a10a8150de56a8131cf0084381ca79ba (patch) | |
| tree | 5e31d47e11b029d1b8b82ab6a6e18253a1a235d1 /arch | |
| parent | 07979fe35895ea6e415cbb3c5551835b2df6bf51 (diff) | |
davinci: DM365 EVM: fix video input mux bits
[ 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.povey@racelogic.co.uk>
Acked-by: Manjunath Hadli <manjunath.hadli@ti.com>
Cc: stable@kernel.org
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-davinci/board-dm365-evm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index 84acef1d0b3d..c3a4f29874be 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/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 { |