diff options
| author | Jonathan Austin <jonathan.austin@arm.com> | 2013-08-29 18:41:11 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-04 10:55:46 -0800 |
| commit | 208a11c4412dee65ccf76503fb980d7fb3c5c743 (patch) | |
| tree | 2c728610b91d4c66d256f6dab37f1da81d089628 /arch | |
| parent | 45a8ae89ee0f4d4b33f75b2e619f4112810ff822 (diff) | |
| download | linux-3.10-208a11c4412dee65ccf76503fb980d7fb3c5c743.tar.gz linux-3.10-208a11c4412dee65ccf76503fb980d7fb3c5c743.tar.bz2 linux-3.10-208a11c4412dee65ccf76503fb980d7fb3c5c743.zip | |
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 <jonathan.austin@arm.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 8c60fcb08a9..2f4c92486cf 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c @@ -199,7 +199,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)) |