aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorJonathan Austin <jonathan.austin@arm.com>2013-08-29 18:41:11 +0100
committerOlof Johansson <olof@lixom.net>2013-11-14 10:44:30 -0800
commit30aeadd44deea3f3b0df45b9a70ee0fd5f8d6dc2 (patch)
treecdebfc72386e560a45174f7a8dfecae1df8ab121 /arch/arm
parent004f47bcadd61345306c74404999bd6ee16e22e1 (diff)
downloadlinux-linaro-stable-30aeadd44deea3f3b0df45b9a70ee0fd5f8d6dc2.tar.gz
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>
Diffstat (limited to 'arch/arm')
-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 = {
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))