lkml.org 
[lkml]   [2012]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 116/179] davinci: DM365 EVM: fix video input mux bits
    Date
    From: Jon Povey <jon.povey@racelogic.co.uk>

    -------------------
    This is a commit scheduled for the next v2.6.34 longterm release.
    http://git.kernel.org/?p=linux/kernel/git/paulg/longterm-queue-2.6.34.git
    If you see a problem with using this for longterm, please comment.
    -------------------

    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 | 4 ++--
    1 file 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 df4ab21..7b3201d 100644
    --- a/arch/arm/mach-davinci/board-dm365-evm.c
    +++ b/arch/arm/mach-davinci/board-dm365-evm.c
    @@ -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 {
    --
    1.7.9.6


    \
     
     \ /
      Last update: 2012-05-15 06:21    [W:4.121 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site