aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Austin <jonathan.austin@arm.com>2013-08-29 13:41:11 -0400
committerOlof Johansson <olof@lixom.net>2013-11-14 13:44:30 -0500
commit30aeadd44deea3f3b0df45b9a70ee0fd5f8d6dc2 (patch)
treecdebfc72386e560a45174f7a8dfecae1df8ab121
parent004f47bcadd61345306c74404999bd6ee16e22e1 (diff)
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: Jonathan Austin <jonathan.austin@arm.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Cc: stable@vger.kernel.org Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/mach-integrator/integrator_cp.c3
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 1df6e7602cad..4fc0a195de01 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -198,7 +198,8 @@ static struct mmci_platform_data mmc_data = {
198static void cp_clcd_enable(struct clcd_fb *fb) 198static void cp_clcd_enable(struct clcd_fb *fb)
199{ 199{
200 struct fb_var_screeninfo *var = &fb->fb.var; 200 struct fb_var_screeninfo *var = &fb->fb.var;
201 u32 val = CM_CTRL_STATIC1 | CM_CTRL_STATIC2; 201 u32 val = CM_CTRL_STATIC1 | CM_CTRL_STATIC2
202 | CM_CTRL_LCDEN0 | CM_CTRL_LCDEN1;
202 203
203 if (var->bits_per_pixel <= 8 || 204 if (var->bits_per_pixel <= 8 ||
204 (var->bits_per_pixel == 16 && var->green.length == 5)) 205 (var->bits_per_pixel == 16 && var->green.length == 5))