diff mbox

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

Message ID 1377798071-26790-1-git-send-email-jonathan.austin@arm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jonathan Austin Aug. 29, 2013, 5:41 p.m. UTC 
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

---
...resending this patch to arm@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(-)

Comments

Olof Johansson Sept. 10, 2013, 12:35 a.m. UTC | #1 
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@vger.kernel.org
> 
> ---
> ...resending this patch to arm@kernel.org as suggested by Linus W with this Ack

Applied to fixes.


-Olof
Jonathan Austin Nov. 11, 2013, 6:40 p.m. UTC | #2 
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@vger.kernel.org
>>
>> ---
>> ...resending this patch to arm@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
>
Olof Johansson Nov. 11, 2013, 6:43 p.m. UTC | #3 
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@vger.kernel.org
>>>
>>> ---
>>> ...resending this patch to arm@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
diff mbox

Patch

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))