Commit 30aeadd4 authored by Jonathan Austin's avatar Jonathan Austin Committed by Olof Johansson

ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD

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: default avatarJonathan Austin <jonathan.austin@arm.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 004f47bc
...@@ -198,7 +198,8 @@ static struct mmci_platform_data mmc_data = { ...@@ -198,7 +198,8 @@ static struct mmci_platform_data mmc_data = {
static void cp_clcd_enable(struct clcd_fb *fb) static void cp_clcd_enable(struct clcd_fb *fb)
{ {
struct fb_var_screeninfo *var = &fb->fb.var; 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 || if (var->bits_per_pixel <= 8 ||
(var->bits_per_pixel == 16 && var->green.length == 5)) (var->bits_per_pixel == 16 && var->green.length == 5))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment