diff options
| author |   Catalin Marinas <catalin.marinas@arm.com> | 2006-01-28 20:54:50 +0000 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-28 20:54:50 +0000 |
| commit | 14e54cc391e22bd564993583464577e4e34a2701 (patch) | |
| tree | cc1ba238be80b026ec9e2c3adff4bcfa355530a9 /arch/arm/mach-integrator | |
| parent | [ARM] 3269/1: Add ARMv6 MT_NONSHARED_DEVICE mem_types[] index (diff) | |
| download | linux-dev-14e54cc391e22bd564993583464577e4e34a2701.tar.xz linux-dev-14e54cc391e22bd564993583464577e4e34a2701.zip | |
[ARM] 3289/1: Enable the LCD support for Integrator/CP
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>
Diffstat (limited to 'arch/arm/mach-integrator')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 31820170f306..a0724f2b24ce 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c @@ -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 */ |