[PATCH 1/2] ARM: integrator_cp: Set LCD{0, 1} enable lines when turning on CLCD

[PATCH 1/2] ARM: integrator_cp: Set LCD{0, 1} enable lines when turning on CLCD

[Jonathan Austin]

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 at vger.kernel.org

---
...resending this patch to arm at kernel.org as suggested by Linus W with this Ack

 arch/arm/mach-integrator/integrator_cp.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 8c60fcb..2f4c9248 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))
-- 
1.7.9.5

[PATCH 1/2] ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD

[Olof Johansson]

On Thu, Aug 29, 2013 at 06:41:11PM +0100, Jonathan Austin wrote:
> 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 at vger.kernel.org
> 
> ---
> ...resending this patch to arm at kernel.org as suggested by Linus W with this Ack

Applied to fixes.


-Olof

[PATCH 1/2] ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD

[Jonathan Austin]

Hi Olof,

On 10/09/13 01:35, Olof Johansson wrote:
> On Thu, Aug 29, 2013 at 06:41:11PM +0100, Jonathan Austin wrote:
>> 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 at vger.kernel.org
>>
>> ---
>> ...resending this patch to arm at kernel.org as suggested by Linus W with this Ack
>
> Applied to fixes.
>

How will this go in? I poked in your arm-soc fixes branches and couldn't 
see it there. Did I miss it somewhere or did it fall out?

Jonny

>
> -Olof
>

[PATCH 1/2] ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD

[Olof Johansson]

On Mon, Nov 11, 2013 at 10:40 AM, Jonathan Austin
<jonathan.austin@arm.com> wrote:
> Hi Olof,
>
>
> On 10/09/13 01:35, Olof Johansson wrote:
>>
>> On Thu, Aug 29, 2013 at 06:41:11PM +0100, Jonathan Austin wrote:
>>>
>>> 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 at vger.kernel.org
>>>
>>> ---
>>> ...resending this patch to arm at kernel.org as suggested by Linus W with
>>> this Ack
>>
>>
>> Applied to fixes.
>>
>
> How will this go in? I poked in your arm-soc fixes branches and couldn't see
> it there. Did I miss it somewhere or did it fall out?


Hmm, odd. Yes, it did fall out. I'll re-apply it now for the next set
of patches we're sending up. Sorry about that.


-Olof

[PATCH 1/2] ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD

[Linus Walleij]

On Tue, Jul 23, 2013 at 5:42 PM, Jonathan Austin
<jonathan.austin@arm.com> wrote:

> 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.
>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Jonathan Austin <jonathan.austin@arm.com>

I wonder if these bits should really be set if you have only VGA?
I don't think it hurts but I'm a bit picky with the details...

Anyway since it's a regression:
Acked-by: Linus Walleij <linus.walleij@linaro.org>

You can send it to arm at kernel.org as a fix and ask that the
ARM SoC maintainers apply it directly, also add
Cc: stable at vger.kernel.org so the fix is applied backward.

Yours,
Linus Walleij

[PATCH 1/2] ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD

[Jonathan Austin]

Hi Linus,

On 23/07/13 16:42, Jonathan Austin wrote:
> 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.
>

Assuming this is okay, should this go through you or the patch system?

Jonny
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Jonathan Austin <jonathan.austin@arm.com>
> ---
>   arch/arm/mach-integrator/integrator_cp.c |    3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
> index 8c60fcb..2f4c9248 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))
>

[PATCH 1/2] ARM: integrator_cp: Set LCD{0, 1} enable lines when turning on CLCD

[Jonathan Austin]

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.

Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Jonathan Austin <jonathan.austin@arm.com>
---
 arch/arm/mach-integrator/integrator_cp.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 8c60fcb..2f4c9248 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))
-- 
1.7.9.5