]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
davinci: DM365 EVM: fix video input mux bits
authorJon Povey <jon.povey@racelogic.co.uk>
Tue, 19 Jul 2011 03:30:11 +0000 (12:30 +0900)
committerAndi Kleen <ak@linux.intel.com>
Mon, 1 Aug 2011 20:55:01 +0000 (13:55 -0700)
[ 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>
arch/arm/mach-davinci/board-dm365-evm.c

index 84acef1d0b3d98be0797c1f4c439d58d77173ede..c3a4f29874be19dc6fcf9f43ff017bf81914d88e 100644 (file)
@@ -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 {