]> git.karo-electronics.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)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Thu, 17 May 2012 15:21:12 +0000 (11:21 -0400)
commit 9daedd833a38edd90cf7baa1b1fcf61c3a0721e3 upstream.

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>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
arch/arm/mach-davinci/board-dm365-evm.c

index df4ab2105869c284ae39902538d51fe1c6074f43..7b3201d29183d7f01cede4868103b5aabda4c40a 100644 (file)
@@ -525,7 +525,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);
@@ -546,7 +546,7 @@ fail:
                resets &= ~BIT(1);
 
                if (have_tvp7002()) {
-                       mux |= 2;
+                       mux |= 1;
                        resets &= ~BIT(2);
                        label = "tvp7002 HD";
                } else {