From patchwork Thu Sep 27 08:47:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 1512471 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id F29D33FDAE for ; Thu, 27 Sep 2012 08:47:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753761Ab2I0IrS (ORCPT ); Thu, 27 Sep 2012 04:47:18 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:47395 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753701Ab2I0IrR (ORCPT ); Thu, 27 Sep 2012 04:47:17 -0400 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MB00060X32SPD80@mailout1.samsung.com> for linux-fbdev@vger.kernel.org; Thu, 27 Sep 2012 17:47:16 +0900 (KST) X-AuditID: cbfee61b-b7f2b6d000000f14-25-506412942a17 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 37.7B.03860.49214605; Thu, 27 Sep 2012 17:47:16 +0900 (KST) Received: from DOJG1HAN02 ([12.23.120.99]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MB0003F732S7E30@mmp1.samsung.com> for linux-fbdev@vger.kernel.org; Thu, 27 Sep 2012 17:47:16 +0900 (KST) From: Jingoo Han To: 'Florian Tobias Schandinat' Cc: linux-fbdev@vger.kernel.org, 'Jingoo Han' References: <000901cd9c87$04ca7eb0$0e5f7c10$%han@samsung.com> In-reply-to: <000901cd9c87$04ca7eb0$0e5f7c10$%han@samsung.com> Subject: [PATCH 5/7] video: s3c-fb: move the bit definitions for WINxMAP and WPALCON register Date: Thu, 27 Sep 2012 17:47:16 +0900 Message-id: <000d01cd9c8c$b257deb0$17079c10$%han@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac2chwSwWYQVzmvoRiWLHJL9pzQ1cAABZpVA Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNLMWRmVeSWpSXmKPExsVy+t9jAd0pQikBBmc7tS1O9H1gdWD0+LxJ LoAxissmJTUnsyy1SN8ugStjwrbZTAV/BSs67+1gbWBczdfFyMkhIWAi8fBXAwuELSZx4d56 ti5GLg4hgUWMElfaehghnFlMEiv+nWUHqWITUJP48uUwkM3BISJgJbFpqyZImFnAWWLCjRNs ILaQgK3Eo89XWEFsTgE7ibfLHoC1CgvES5x58pgRpJVFQFVizVJukDAvUPnDjddYIWxBiR+T 77FAjNSSWL/zOBOELS+xec1bZpBWCQF1iUd/dUHCIgJGEvu+zmCGKBGR2PfiHeMERqFZSCbN QjJpFpJJs5C0LGBkWcUomlqQXFCclJ5rpFecmFtcmpeul5yfu4kRHMTPpHcwrmqwOMQowMGo xMMb4J4cIMSaWFZcmXuIUYKDWUmEd9NtoBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXFe4U+BAUIC 6YklqdmpqQWpRTBZJg5OqQZGz3rrfu6lF6QStZbKRC89dn7SxX83b00xMt/Zk/O67L7Fn9sr fXN59Zby1y46Kqa0ZOu9mM5tnZafWKv9jgW2MO+63Z2j85uhZxXTlqo39r0hHjHbWcLTncNy ZYxSLRnzbm37JBEhefesff2ye0+jr+56b/j4Sa/6UZdda99NesB1+7WMeImVEktxRqKhFnNR cSIAr924Ql4CAAA= Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org The bit definitions for WINxMAP and WPALCON register are moved to right place. Signed-off-by: Jingoo Han --- include/video/samsung_fimd.h | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/include/video/samsung_fimd.h b/include/video/samsung_fimd.h index 7c9a9bc..d5fe38b 100644 --- a/include/video/samsung_fimd.h +++ b/include/video/samsung_fimd.h @@ -376,16 +376,20 @@ #define WxKEYCON1_COLVAL_LIMIT (0xffffff) #define WxKEYCON1_COLVAL(_x) ((_x) << 0) - /* Window blanking (MAP) */ - +#define WINxMAP(_win) (0x180 + ((_win) * 4)) #define WINxMAP_MAP (1 << 24) #define WINxMAP_MAP_COLOUR_MASK (0xffffff << 0) #define WINxMAP_MAP_COLOUR_SHIFT (0) #define WINxMAP_MAP_COLOUR_LIMIT (0xffffff) #define WINxMAP_MAP_COLOUR(_x) ((_x) << 0) +/* Winodw palette control */ +#define WPALCON (0x1A0) #define WPALCON_PAL_UPDATE (1 << 9) +#define WPALCON_W4PAL_16BPP_A555 (1 << 8) +#define WPALCON_W3PAL_16BPP_A555 (1 << 7) +#define WPALCON_W2PAL_16BPP_A555 (1 << 6) #define WPALCON_W1PAL_MASK (0x7 << 3) #define WPALCON_W1PAL_SHIFT (3) #define WPALCON_W1PAL_25BPP_A888 (0x0 << 3) @@ -395,7 +399,6 @@ #define WPALCON_W1PAL_18BPP (0x4 << 3) #define WPALCON_W1PAL_16BPP_A555 (0x5 << 3) #define WPALCON_W1PAL_16BPP_565 (0x6 << 3) - #define WPALCON_W0PAL_MASK (0x7 << 0) #define WPALCON_W0PAL_SHIFT (0) #define WPALCON_W0PAL_25BPP_A888 (0x0 << 0) @@ -416,9 +419,6 @@ #define VIDCON1_FSTATUS_EVEN (1 << 15) #define DITHMODE (0x170) -#define WINxMAP(_win) (0x180 + ((_win) * 4)) - - #define DITHMODE_R_POS_MASK (0x3 << 5) #define DITHMODE_R_POS_SHIFT (5) #define DITHMODE_R_POS_8BIT (0x0 << 5) @@ -439,16 +439,6 @@ #define DITHMODE_DITH_EN (1 << 0) -#define WPALCON (0x1A0) - -/* Palette control */ -/* Note for S5PC100: you can still use those macros on WPALCON (aka WPALCON_L), - * but make sure that WPALCON_H W2PAL-W4PAL entries are zeroed out */ -#define WPALCON_W4PAL_16BPP_A555 (1 << 8) -#define WPALCON_W3PAL_16BPP_A555 (1 << 7) -#define WPALCON_W2PAL_16BPP_A555 (1 << 6) - - /* Notes on per-window bpp settings * * Value Win0 Win1 Win2 Win3 Win 4