Skip to content

Commit

Permalink
ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD
Browse files Browse the repository at this point in the history
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 <[email protected]>
Acked-by: Linus Walleij <[email protected]>
Cc: [email protected]
Signed-off-by: Olof Johansson <[email protected]>
  • Loading branch information
jaustin authored and olofj committed Nov 14, 2013
1 parent 004f47b commit 30aeadd
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/arm/mach-integrator/integrator_cp.c
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,8 @@ static struct mmci_platform_data mmc_data = {
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))
Expand Down

0 comments on commit 30aeadd

Please sign in to comment.