From: Jonathan Austin Date: Thu, 29 Aug 2013 17:41:11 +0000 (+0100) Subject: ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD X-Git-Tag: v3.2.54~121 X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=41e8cbd9240c43424a698495eab0acbfe096203e;p=unionfs-2.6.38.y.git ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD 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 Acked-by: Linus Walleij Signed-off-by: Olof Johansson Signed-off-by: Ben Hutchings --- diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 5de49c33e4d..892d0d647eb 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c @@ -384,7 +384,8 @@ static struct amba_device aaci_device = { 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))