[ARM] 3289/1: Enable the LCD support for Integrator/CP
authorCatalin Marinas <catalin.marinas@arm.com>
Sat, 28 Jan 2006 20:54:50 +0000 (20:54 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 28 Jan 2006 20:54:50 +0000 (20:54 +0000)
Patch from Catalin Marinas

The LCD displays were no longer working with Integrator/CP after some
changes to the setup code. This patch re-enables them.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-integrator/integrator_cp.c

index 31820170f3068600a373915227d9f6a090cdf9f1..a0724f2b24cec783a242887971b5fc0d2e5a6592 100644 (file)
@@ -469,7 +469,9 @@ static void cp_clcd_enable(struct clcd_fb *fb)
        if (fb->fb.var.bits_per_pixel <= 8)
                val = CM_CTRL_LCDMUXSEL_VGA_8421BPP;
        else if (fb->fb.var.bits_per_pixel <= 16)
-               val = CM_CTRL_LCDMUXSEL_VGA_16BPP;
+               val = CM_CTRL_LCDMUXSEL_VGA_16BPP
+                       | CM_CTRL_LCDEN0 | CM_CTRL_LCDEN1
+                       | CM_CTRL_STATIC1 | CM_CTRL_STATIC2;
        else
                val = 0; /* no idea for this, don't trust the docs */