lkml.org 
[lkml]   [2013]   [Dec]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.5 36/90] ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD
    Date
    3.5.7.27 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jonathan Austin <jonathan.austin@arm.com>

    commit 30aeadd44deea3f3b0df45b9a70ee0fd5f8d6dc2 upstream.

    This turns on the internal integrator LCD display(s). It seems that the code
    to do this got lost in refactoring of the CLCD driver.

    Signed-off-by: Jonathan Austin <jonathan.austin@arm.com>
    Acked-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Olof Johansson <olof@lixom.net>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    arch/arm/mach-integrator/integrator_cp.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
    index a56c536..a7c5b00 100644
    --- a/arch/arm/mach-integrator/integrator_cp.c
    +++ b/arch/arm/mach-integrator/integrator_cp.c
    @@ -352,7 +352,8 @@ static AMBA_APB_DEVICE(aaci, "mb:1d", 0, INTEGRATOR_CP_AACI_BASE,
    static void cp_clcd_enable(struct clcd_fb *fb)
    {
    struct fb_var_screeninfo *var = &fb->fb.var;
    - u32 val = CM_CTRL_STATIC1 | CM_CTRL_STATIC2;
    + u32 val = CM_CTRL_STATIC1 | CM_CTRL_STATIC2
    + | CM_CTRL_LCDEN0 | CM_CTRL_LCDEN1;

    if (var->bits_per_pixel <= 8 ||
    (var->bits_per_pixel == 16 && var->green.length == 5))
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-12-05 20:01    [W:5.567 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site