From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Hans J. Koch" Subject: [PATCH] pxafb: Add missing code to support palette formats Date: Fri, 23 Nov 2007 12:26:16 +0100 Message-ID: <20071123122616.30bd242c@bluebox.local> Reply-To: linux-fbdev-devel@lists.sourceforge.net Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1IvWhp-0007SF-5x for linux-fbdev-devel@lists.sourceforge.net; Fri, 23 Nov 2007 03:28:39 -0800 Received: from www.tglx.de ([62.245.132.106]) by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.44) id 1IvWhm-0001Xl-LR for linux-fbdev-devel@lists.sourceforge.net; Fri, 23 Nov 2007 03:28:20 -0800 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-fbdev-devel-bounces@lists.sourceforge.net Errors-To: linux-fbdev-devel-bounces@lists.sourceforge.net To: linux-arm-kernel@lists.arm.linux.org.uk Cc: linux-fbdev-devel@lists.sourceforge.net Subject: pxafb: Add missing code to support palette formats Date: Fri, 23 Nov 2007 10:33:24 +0100 From: Hans J Koch A few lines of code are missing to support different palette formats in pxafb. This patch adds them, code was tested on PXA270. Signed-off-by: Hans J Koch --- drivers/video/pxafb.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) Index: linux-2.6.24-rc/drivers/video/pxafb.c =================================================================== --- linux-2.6.24-rc.orig/drivers/video/pxafb.c 2007-11-22 23:03:28.000000000 +0100 +++ linux-2.6.24-rc/drivers/video/pxafb.c 2007-11-22 23:43:07.000000000 +0100 @@ -745,8 +745,14 @@ fbi->reg_lccr1 = new_regs.lccr1; fbi->reg_lccr2 = new_regs.lccr2; fbi->reg_lccr3 = new_regs.lccr3; - fbi->reg_lccr4 = LCCR4 & (~LCCR4_PAL_FOR_MASK); - fbi->reg_lccr4 |= (fbi->lccr4 & LCCR4_PAL_FOR_MASK); + + if (((read_cpuid(CPUID_ID) >> 4) & 0x1f) == 0x11) { + /* PXA 27x only */ + fbi->reg_lccr4 = LCCR4 & (~LCCR4_PAL_FOR_MASK); + fbi->reg_lccr4 |= (fbi->lccr4 & LCCR4_PAL_FOR_MASK); + } else + fbi->reg_lccr4 = 0; + set_hsync_time(fbi, pcd); local_irq_restore(flags); @@ -838,6 +844,8 @@ clk_enable(fbi->clk); /* Sequence from 11.7.10 */ + if (((read_cpuid(CPUID_ID) >> 4) & 0x1f) == 0x11) + LCCR4 = fbi->reg_lccr4; /* PXA 27x only */ LCCR3 = fbi->reg_lccr3; LCCR2 = fbi->reg_lccr2; LCCR1 = fbi->reg_lccr1; ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/