[PATCH 1/3] Move FIMD register headers to include/video/

Jingoo Han
2012-07-30T08:53:56Z

On Monday, July 30, 2012 5:45 PM, Leela Krishna Amudala wrote:
>
> Moved the contents of regs-fb-v4.h and regs-fb.h from arch side
> to include/video/samsung_fimd.h
>
> Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com>
> ---
> arch/arm/plat-samsung/include/plat/regs-fb-v4.h | 159 -------
> arch/arm/plat-samsung/include/plat/regs-fb.h | 403 -----------------
> include/video/samsung_fimd.h | 533 +++++++++++++++++++++++
> 3 files changed, 533 insertions(+), 562 deletions(-)
> delete mode 100644 arch/arm/plat-samsung/include/plat/regs-fb-v4.h
> delete mode 100644 arch/arm/plat-samsung/include/plat/regs-fb.h
> create mode 100644 include/video/samsung_fimd.h
>
> diff --git a/arch/arm/plat-samsung/include/plat/regs-fb-v4.h b/arch/arm/plat-samsung/include/plat/regs-
> fb-v4.h
> deleted file mode 100644
> index 4c3647f..0000000
> --- a/arch/arm/plat-samsung/include/plat/regs-fb-v4.h
> +++ /dev/null
> @@ -1,159 +0,0 @@
> -/* arch/arm/plat-samsung/include/plat/regs-fb-v4.h
> - *
> - * Copyright 2008 Openmoko, Inc.
> - * Copyright 2008 Simtec Electronics
> - * http://armlinux.simtec.co.uk/
> - * Ben Dooks <ben@simtec.co.uk>
> - *
> - * S3C64XX - new-style framebuffer register definitions
> - *
> - * This is the register set for the new style framebuffer interface
> - * found from the S3C2443 onwards and specifically the S3C64XX series
> - * S3C6400 and S3C6410.
> - *
> - * The file contains the cpu specific items which change between whichever
> - * architecture is selected. See <plat/regs-fb.h> for the core definitions
> - * that are the same.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> -*/
> -
> -/* include the core definitions here, in case we really do need to
> - * override them at a later date.
> -*/
> -
> -#include <plat/regs-fb.h>
> -
> -#define S3C_FB_MAX_WIN (5) /* number of hardware windows available. */
> -#define VIDCON1_FSTATUS_EVEN (1 << 15)
> -
> -/* Video timing controls */
> -#define VIDTCON0 (0x10)
> -#define VIDTCON1 (0x14)
> -#define VIDTCON2 (0x18)
> -
> -/* Window position controls */
> -
> -#define WINCON(_win) (0x20 + ((_win) * 4))
> -
> -/* OSD1 and OSD4 do not have register D */
> -
> -#define VIDOSD_BASE (0x40)
> -
> -#define VIDINTCON0 (0x130)
> -
> -/* WINCONx */
> -
> -#define WINCONx_CSCWIDTH_MASK (0x3 << 26)
> -#define WINCONx_CSCWIDTH_SHIFT (26)
> -#define WINCONx_CSCWIDTH_WIDE (0x0 << 26)
> -#define WINCONx_CSCWIDTH_NARROW (0x3 << 26)
> -
> -#define WINCONx_ENLOCAL (1 << 22)
> -#define WINCONx_BUFSTATUS (1 << 21)
> -#define WINCONx_BUFSEL (1 << 20)
> -#define WINCONx_BUFAUTOEN (1 << 19)
> -#define WINCONx_YCbCr (1 << 13)
> -
> -#define WINCON1_LOCALSEL_CAMIF (1 << 23)
> -
> -#define WINCON2_LOCALSEL_CAMIF (1 << 23)
> -#define WINCON2_BLD_PIX (1 << 6)
> -
> -#define WINCON2_ALPHA_SEL (1 << 1)
> -#define WINCON2_BPPMODE_MASK (0xf << 2)
> -#define WINCON2_BPPMODE_SHIFT (2)
> -#define WINCON2_BPPMODE_1BPP (0x0 << 2)
> -#define WINCON2_BPPMODE_2BPP (0x1 << 2)
> -#define WINCON2_BPPMODE_4BPP (0x2 << 2)
> -#define WINCON2_BPPMODE_8BPP_1232 (0x4 << 2)
> -#define WINCON2_BPPMODE_16BPP_565 (0x5 << 2)
> -#define WINCON2_BPPMODE_16BPP_A1555 (0x6 << 2)
> -#define WINCON2_BPPMODE_16BPP_I1555 (0x7 << 2)
> -#define WINCON2_BPPMODE_18BPP_666 (0x8 << 2)
> -#define WINCON2_BPPMODE_18BPP_A1665 (0x9 << 2)
> -#define WINCON2_BPPMODE_19BPP_A1666 (0xa << 2)
> -#define WINCON2_BPPMODE_24BPP_888 (0xb << 2)
> -#define WINCON2_BPPMODE_24BPP_A1887 (0xc << 2)
> -#define WINCON2_BPPMODE_25BPP_A1888 (0xd << 2)
> -#define WINCON2_BPPMODE_28BPP_A4888 (0xd << 2)
> -
> -#define WINCON3_BLD_PIX (1 << 6)
> -
> -#define WINCON3_ALPHA_SEL (1 << 1)
> -#define WINCON3_BPPMODE_MASK (0xf << 2)
> -#define WINCON3_BPPMODE_SHIFT (2)
> -#define WINCON3_BPPMODE_1BPP (0x0 << 2)
> -#define WINCON3_BPPMODE_2BPP (0x1 << 2)
> -#define WINCON3_BPPMODE_4BPP (0x2 << 2)
> -#define WINCON3_BPPMODE_16BPP_565 (0x5 << 2)
> -#define WINCON3_BPPMODE_16BPP_A1555 (0x6 << 2)
> -#define WINCON3_BPPMODE_16BPP_I1555 (0x7 << 2)
> -#define WINCON3_BPPMODE_18BPP_666 (0x8 << 2)
> -#define WINCON3_BPPMODE_18BPP_A1665 (0x9 << 2)
> -#define WINCON3_BPPMODE_19BPP_A1666 (0xa << 2)
> -#define WINCON3_BPPMODE_24BPP_888 (0xb << 2)
> -#define WINCON3_BPPMODE_24BPP_A1887 (0xc << 2)
> -#define WINCON3_BPPMODE_25BPP_A1888 (0xd << 2)
> -#define WINCON3_BPPMODE_28BPP_A4888 (0xd << 2)
> -
> -#define VIDINTCON0_FIFIOSEL_WINDOW2 (0x10 << 5)
> -#define VIDINTCON0_FIFIOSEL_WINDOW3 (0x20 << 5)
> -#define VIDINTCON0_FIFIOSEL_WINDOW4 (0x40 << 5)
> -
> -#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)
> -#define DITHMODE_R_POS_6BIT (0x1 << 5)
> -#define DITHMODE_R_POS_5BIT (0x2 << 5)
> -
> -#define DITHMODE_G_POS_MASK (0x3 << 3)
> -#define DITHMODE_G_POS_SHIFT (3)
> -#define DITHMODE_G_POS_8BIT (0x0 << 3)
> -#define DITHMODE_G_POS_6BIT (0x1 << 3)
> -#define DITHMODE_G_POS_5BIT (0x2 << 3)
> -
> -#define DITHMODE_B_POS_MASK (0x3 << 1)
> -#define DITHMODE_B_POS_SHIFT (1)
> -#define DITHMODE_B_POS_8BIT (0x0 << 1)
> -#define DITHMODE_B_POS_6BIT (0x1 << 1)
> -#define DITHMODE_B_POS_5BIT (0x2 << 1)
> -
> -#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
> - * 0000 1(P) 1(P) 1(P) 1(P) 1(P)
> - * 0001 2(P) 2(P) 2(P) 2(P) 2(P)
> - * 0010 4(P) 4(P) 4(P) 4(P) -none-
> - * 0011 8(P) 8(P) -none- -none- -none-
> - * 0100 -none- 8(A232) 8(A232) -none- -none-
> - * 0101 16(565) 16(565) 16(565) 16(565) 16(565)
> - * 0110 -none- 16(A555) 16(A555) 16(A555) 16(A555)
> - * 0111 16(I555) 16(I565) 16(I555) 16(I555) 16(I555)
> - * 1000 18(666) 18(666) 18(666) 18(666) 18(666)
> - * 1001 -none- 18(A665) 18(A665) 18(A665) 16(A665)
> - * 1010 -none- 19(A666) 19(A666) 19(A666) 19(A666)
> - * 1011 24(888) 24(888) 24(888) 24(888) 24(888)
> - * 1100 -none- 24(A887) 24(A887) 24(A887) 24(A887)
> - * 1101 -none- 25(A888) 25(A888) 25(A888) 25(A888)
> - * 1110 -none- -none- -none- -none- -none-
> - * 1111 -none- -none- -none- -none- -none-
> -*/
> diff --git a/arch/arm/plat-samsung/include/plat/regs-fb.h b/arch/arm/plat-samsung/include/plat/regs-fb.h
> deleted file mode 100644
> index 9a78012..0000000
> --- a/arch/arm/plat-samsung/include/plat/regs-fb.h
> +++ /dev/null
> @@ -1,403 +0,0 @@
> -/* arch/arm/plat-samsung/include/plat/regs-fb.h
> - *
> - * Copyright 2008 Openmoko, Inc.
> - * Copyright 2008 Simtec Electronics
> - * http://armlinux.simtec.co.uk/
> - * Ben Dooks <ben@simtec.co.uk>
> - *
> - * S3C Platform - new-style framebuffer register definitions
> - *
> - * This is the register set for the new style framebuffer interface
> - * found from the S3C2443 onwards into the S3C2416, S3C2450 and the
> - * S3C64XX series such as the S3C6400 and S3C6410.
> - *
> - * The file does not contain the cpu specific items which are based on
> - * whichever architecture is selected, it only contains the core of the
> - * register set. See <mach/regs-fb.h> to get the specifics.
> - *
> - * Note, we changed to using regs-fb.h as it avoids any clashes with
> - * the original regs-lcd.h so out of the way of regs-lcd.h as well as
> - * indicating the newer block is much more than just an LCD interface.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> -*/
> -
> -/* Please do not include this file directly, use <mach/regs-fb.h> to
> - * ensure all the localised SoC support is included as necessary.
> -*/
> -
> -/* VIDCON0 */
> -
> -#define VIDCON0 (0x00)
> -#define VIDCON0_INTERLACE (1 << 29)
> -#define VIDCON0_VIDOUT_MASK (0x3 << 26)
> -#define VIDCON0_VIDOUT_SHIFT (26)
> -#define VIDCON0_VIDOUT_RGB (0x0 << 26)
> -#define VIDCON0_VIDOUT_TV (0x1 << 26)
> -#define VIDCON0_VIDOUT_I80_LDI0 (0x2 << 26)
> -#define VIDCON0_VIDOUT_I80_LDI1 (0x3 << 26)
> -
> -#define VIDCON0_L1_DATA_MASK (0x7 << 23)
> -#define VIDCON0_L1_DATA_SHIFT (23)
> -#define VIDCON0_L1_DATA_16BPP (0x0 << 23)
> -#define VIDCON0_L1_DATA_18BPP16 (0x1 << 23)
> -#define VIDCON0_L1_DATA_18BPP9 (0x2 << 23)
> -#define VIDCON0_L1_DATA_24BPP (0x3 << 23)
> -#define VIDCON0_L1_DATA_18BPP (0x4 << 23)
> -#define VIDCON0_L1_DATA_16BPP8 (0x5 << 23)
> -
> -#define VIDCON0_L0_DATA_MASK (0x7 << 20)
> -#define VIDCON0_L0_DATA_SHIFT (20)
> -#define VIDCON0_L0_DATA_16BPP (0x0 << 20)
> -#define VIDCON0_L0_DATA_18BPP16 (0x1 << 20)
> -#define VIDCON0_L0_DATA_18BPP9 (0x2 << 20)
> -#define VIDCON0_L0_DATA_24BPP (0x3 << 20)
> -#define VIDCON0_L0_DATA_18BPP (0x4 << 20)
> -#define VIDCON0_L0_DATA_16BPP8 (0x5 << 20)
> -
> -#define VIDCON0_PNRMODE_MASK (0x3 << 17)
> -#define VIDCON0_PNRMODE_SHIFT (17)
> -#define VIDCON0_PNRMODE_RGB (0x0 << 17)
> -#define VIDCON0_PNRMODE_BGR (0x1 << 17)
> -#define VIDCON0_PNRMODE_SERIAL_RGB (0x2 << 17)
> -#define VIDCON0_PNRMODE_SERIAL_BGR (0x3 << 17)
> -
> -#define VIDCON0_CLKVALUP (1 << 16)
> -#define VIDCON0_CLKVAL_F_MASK (0xff << 6)
> -#define VIDCON0_CLKVAL_F_SHIFT (6)
> -#define VIDCON0_CLKVAL_F_LIMIT (0xff)
> -#define VIDCON0_CLKVAL_F(_x) ((_x) << 6)
> -#define VIDCON0_VLCKFREE (1 << 5)
> -#define VIDCON0_CLKDIR (1 << 4)
> -
> -#define VIDCON0_CLKSEL_MASK (0x3 << 2)
> -#define VIDCON0_CLKSEL_SHIFT (2)
> -#define VIDCON0_CLKSEL_HCLK (0x0 << 2)
> -#define VIDCON0_CLKSEL_LCD (0x1 << 2)
> -#define VIDCON0_CLKSEL_27M (0x3 << 2)
> -
> -#define VIDCON0_ENVID (1 << 1)
> -#define VIDCON0_ENVID_F (1 << 0)
> -
> -#define VIDCON1 (0x04)
> -#define VIDCON1_LINECNT_MASK (0x7ff << 16)
> -#define VIDCON1_LINECNT_SHIFT (16)
> -#define VIDCON1_LINECNT_GET(_v) (((_v) >> 16) & 0x7ff)
> -#define VIDCON1_VSTATUS_MASK (0x3 << 13)
> -#define VIDCON1_VSTATUS_SHIFT (13)
> -#define VIDCON1_VSTATUS_VSYNC (0x0 << 13)
> -#define VIDCON1_VSTATUS_BACKPORCH (0x1 << 13)
> -#define VIDCON1_VSTATUS_ACTIVE (0x2 << 13)
> -#define VIDCON1_VSTATUS_FRONTPORCH (0x0 << 13)
> -#define VIDCON1_VCLK_MASK (0x3 << 9)
> -#define VIDCON1_VCLK_HOLD (0x0 << 9)
> -#define VIDCON1_VCLK_RUN (0x1 << 9)
> -
> -#define VIDCON1_INV_VCLK (1 << 7)
> -#define VIDCON1_INV_HSYNC (1 << 6)
> -#define VIDCON1_INV_VSYNC (1 << 5)
> -#define VIDCON1_INV_VDEN (1 << 4)
> -
> -/* VIDCON2 */
> -
> -#define VIDCON2 (0x08)
> -#define VIDCON2_EN601 (1 << 23)
> -#define VIDCON2_TVFMTSEL_SW (1 << 14)
> -
> -#define VIDCON2_TVFMTSEL1_MASK (0x3 << 12)
> -#define VIDCON2_TVFMTSEL1_SHIFT (12)
> -#define VIDCON2_TVFMTSEL1_RGB (0x0 << 12)
> -#define VIDCON2_TVFMTSEL1_YUV422 (0x1 << 12)
> -#define VIDCON2_TVFMTSEL1_YUV444 (0x2 << 12)
> -
> -#define VIDCON2_ORGYCbCr (1 << 8)
> -#define VIDCON2_YUVORDCrCb (1 << 7)
> -
> -/* PRTCON (S3C6410, S5PC100)
> - * Might not be present in the S3C6410 documentation,
> - * but tests prove it's there almost for sure; shouldn't hurt in any case.
> - */
> -#define PRTCON (0x0c)
> -#define PRTCON_PROTECT (1 << 11)
> -
> -/* VIDTCON0 */
> -
> -#define VIDTCON0_VBPDE_MASK (0xff << 24)
> -#define VIDTCON0_VBPDE_SHIFT (24)
> -#define VIDTCON0_VBPDE_LIMIT (0xff)
> -#define VIDTCON0_VBPDE(_x) ((_x) << 24)
> -
> -#define VIDTCON0_VBPD_MASK (0xff << 16)
> -#define VIDTCON0_VBPD_SHIFT (16)
> -#define VIDTCON0_VBPD_LIMIT (0xff)
> -#define VIDTCON0_VBPD(_x) ((_x) << 16)
> -
> -#define VIDTCON0_VFPD_MASK (0xff << 8)
> -#define VIDTCON0_VFPD_SHIFT (8)
> -#define VIDTCON0_VFPD_LIMIT (0xff)
> -#define VIDTCON0_VFPD(_x) ((_x) << 8)
> -
> -#define VIDTCON0_VSPW_MASK (0xff << 0)
> -#define VIDTCON0_VSPW_SHIFT (0)
> -#define VIDTCON0_VSPW_LIMIT (0xff)
> -#define VIDTCON0_VSPW(_x) ((_x) << 0)
> -
> -/* VIDTCON1 */
> -
> -#define VIDTCON1_VFPDE_MASK (0xff << 24)
> -#define VIDTCON1_VFPDE_SHIFT (24)
> -#define VIDTCON1_VFPDE_LIMIT (0xff)
> -#define VIDTCON1_VFPDE(_x) ((_x) << 24)
> -
> -#define VIDTCON1_HBPD_MASK (0xff << 16)
> -#define VIDTCON1_HBPD_SHIFT (16)
> -#define VIDTCON1_HBPD_LIMIT (0xff)
> -#define VIDTCON1_HBPD(_x) ((_x) << 16)
> -
> -#define VIDTCON1_HFPD_MASK (0xff << 8)
> -#define VIDTCON1_HFPD_SHIFT (8)
> -#define VIDTCON1_HFPD_LIMIT (0xff)
> -#define VIDTCON1_HFPD(_x) ((_x) << 8)
> -
> -#define VIDTCON1_HSPW_MASK (0xff << 0)
> -#define VIDTCON1_HSPW_SHIFT (0)
> -#define VIDTCON1_HSPW_LIMIT (0xff)
> -#define VIDTCON1_HSPW(_x) ((_x) << 0)
> -
> -#define VIDTCON2 (0x18)
> -#define VIDTCON2_LINEVAL_E(_x) ((((_x) & 0x800) >> 11) << 23)
> -#define VIDTCON2_LINEVAL_MASK (0x7ff << 11)
> -#define VIDTCON2_LINEVAL_SHIFT (11)
> -#define VIDTCON2_LINEVAL_LIMIT (0x7ff)
> -#define VIDTCON2_LINEVAL(_x) (((_x) & 0x7ff) << 11)
> -
> -#define VIDTCON2_HOZVAL_E(_x) ((((_x) & 0x800) >> 11) << 22)
> -#define VIDTCON2_HOZVAL_MASK (0x7ff << 0)
> -#define VIDTCON2_HOZVAL_SHIFT (0)
> -#define VIDTCON2_HOZVAL_LIMIT (0x7ff)
> -#define VIDTCON2_HOZVAL(_x) (((_x) & 0x7ff) << 0)
> -
> -/* WINCONx */
> -
> -
> -#define WINCONx_BITSWP (1 << 18)
> -#define WINCONx_BYTSWP (1 << 17)
> -#define WINCONx_HAWSWP (1 << 16)
> -#define WINCONx_WSWP (1 << 15)
> -#define WINCONx_BURSTLEN_MASK (0x3 << 9)
> -#define WINCONx_BURSTLEN_SHIFT (9)
> -#define WINCONx_BURSTLEN_16WORD (0x0 << 9)
> -#define WINCONx_BURSTLEN_8WORD (0x1 << 9)
> -#define WINCONx_BURSTLEN_4WORD (0x2 << 9)
> -
> -#define WINCONx_ENWIN (1 << 0)
> -#define WINCON0_BPPMODE_MASK (0xf << 2)
> -#define WINCON0_BPPMODE_SHIFT (2)
> -#define WINCON0_BPPMODE_1BPP (0x0 << 2)
> -#define WINCON0_BPPMODE_2BPP (0x1 << 2)
> -#define WINCON0_BPPMODE_4BPP (0x2 << 2)
> -#define WINCON0_BPPMODE_8BPP_PALETTE (0x3 << 2)
> -#define WINCON0_BPPMODE_16BPP_565 (0x5 << 2)
> -#define WINCON0_BPPMODE_16BPP_1555 (0x7 << 2)
> -#define WINCON0_BPPMODE_18BPP_666 (0x8 << 2)
> -#define WINCON0_BPPMODE_24BPP_888 (0xb << 2)
> -
> -#define WINCON1_BLD_PIX (1 << 6)
> -
> -#define WINCON1_ALPHA_SEL (1 << 1)
> -#define WINCON1_BPPMODE_MASK (0xf << 2)
> -#define WINCON1_BPPMODE_SHIFT (2)
> -#define WINCON1_BPPMODE_1BPP (0x0 << 2)
> -#define WINCON1_BPPMODE_2BPP (0x1 << 2)
> -#define WINCON1_BPPMODE_4BPP (0x2 << 2)
> -#define WINCON1_BPPMODE_8BPP_PALETTE (0x3 << 2)
> -#define WINCON1_BPPMODE_8BPP_1232 (0x4 << 2)
> -#define WINCON1_BPPMODE_16BPP_565 (0x5 << 2)
> -#define WINCON1_BPPMODE_16BPP_A1555 (0x6 << 2)
> -#define WINCON1_BPPMODE_16BPP_I1555 (0x7 << 2)
> -#define WINCON1_BPPMODE_18BPP_666 (0x8 << 2)
> -#define WINCON1_BPPMODE_18BPP_A1665 (0x9 << 2)
> -#define WINCON1_BPPMODE_19BPP_A1666 (0xa << 2)
> -#define WINCON1_BPPMODE_24BPP_888 (0xb << 2)
> -#define WINCON1_BPPMODE_24BPP_A1887 (0xc << 2)
> -#define WINCON1_BPPMODE_25BPP_A1888 (0xd << 2)
> -#define WINCON1_BPPMODE_28BPP_A4888 (0xd << 2)
> -
> -/* S5PV210 */
> -#define SHADOWCON (0x34)
> -#define SHADOWCON_WINx_PROTECT(_win) (1 << (10 + (_win)))
> -/* DMA channels (all windows) */
> -#define SHADOWCON_CHx_ENABLE(_win) (1 << (_win))
> -/* Local input channels (windows 0-2) */
> -#define SHADOWCON_CHx_LOCAL_ENABLE(_win) (1 << (5 + (_win)))
> -
> -#define VIDOSDxA_TOPLEFT_X_E(_x) ((((_x) & 0x800) >> 11) << 23)
> -#define VIDOSDxA_TOPLEFT_X_MASK (0x7ff << 11)
> -#define VIDOSDxA_TOPLEFT_X_SHIFT (11)
> -#define VIDOSDxA_TOPLEFT_X_LIMIT (0x7ff)
> -#define VIDOSDxA_TOPLEFT_X(_x) (((_x) & 0x7ff) << 11)
> -
> -#define VIDOSDxA_TOPLEFT_Y_E(_x) ((((_x) & 0x800) >> 11) << 22)
> -#define VIDOSDxA_TOPLEFT_Y_MASK (0x7ff << 0)
> -#define VIDOSDxA_TOPLEFT_Y_SHIFT (0)
> -#define VIDOSDxA_TOPLEFT_Y_LIMIT (0x7ff)
> -#define VIDOSDxA_TOPLEFT_Y(_x) (((_x) & 0x7ff) << 0)
> -
> -#define VIDOSDxB_BOTRIGHT_X_E(_x) ((((_x) & 0x800) >> 11) << 23)
> -#define VIDOSDxB_BOTRIGHT_X_MASK (0x7ff << 11)
> -#define VIDOSDxB_BOTRIGHT_X_SHIFT (11)
> -#define VIDOSDxB_BOTRIGHT_X_LIMIT (0x7ff)
> -#define VIDOSDxB_BOTRIGHT_X(_x) (((_x) & 0x7ff) << 11)
> -
> -#define VIDOSDxB_BOTRIGHT_Y_E(_x) ((((_x) & 0x800) >> 11) << 22)
> -#define VIDOSDxB_BOTRIGHT_Y_MASK (0x7ff << 0)
> -#define VIDOSDxB_BOTRIGHT_Y_SHIFT (0)
> -#define VIDOSDxB_BOTRIGHT_Y_LIMIT (0x7ff)
> -#define VIDOSDxB_BOTRIGHT_Y(_x) (((_x) & 0x7ff) << 0)
> -
> -/* For VIDOSD[1..4]C */
> -#define VIDISD14C_ALPHA0_R(_x) ((_x) << 20)
> -#define VIDISD14C_ALPHA0_G_MASK (0xf << 16)
> -#define VIDISD14C_ALPHA0_G_SHIFT (16)
> -#define VIDISD14C_ALPHA0_G_LIMIT (0xf)
> -#define VIDISD14C_ALPHA0_G(_x) ((_x) << 16)
> -#define VIDISD14C_ALPHA0_B_MASK (0xf << 12)
> -#define VIDISD14C_ALPHA0_B_SHIFT (12)
> -#define VIDISD14C_ALPHA0_B_LIMIT (0xf)
> -#define VIDISD14C_ALPHA0_B(_x) ((_x) << 12)
> -#define VIDISD14C_ALPHA1_R_MASK (0xf << 8)
> -#define VIDISD14C_ALPHA1_R_SHIFT (8)
> -#define VIDISD14C_ALPHA1_R_LIMIT (0xf)
> -#define VIDISD14C_ALPHA1_R(_x) ((_x) << 8)
> -#define VIDISD14C_ALPHA1_G_MASK (0xf << 4)
> -#define VIDISD14C_ALPHA1_G_SHIFT (4)
> -#define VIDISD14C_ALPHA1_G_LIMIT (0xf)
> -#define VIDISD14C_ALPHA1_G(_x) ((_x) << 4)
> -#define VIDISD14C_ALPHA1_B_MASK (0xf << 0)
> -#define VIDISD14C_ALPHA1_B_SHIFT (0)
> -#define VIDISD14C_ALPHA1_B_LIMIT (0xf)
> -#define VIDISD14C_ALPHA1_B(_x) ((_x) << 0)
> -
> -/* Video buffer addresses */
> -#define VIDW_BUF_START(_buff) (0xA0 + ((_buff) * 8))
> -#define VIDW_BUF_START1(_buff) (0xA4 + ((_buff) * 8))
> -#define VIDW_BUF_END(_buff) (0xD0 + ((_buff) * 8))
> -#define VIDW_BUF_END1(_buff) (0xD4 + ((_buff) * 8))
> -#define VIDW_BUF_SIZE(_buff) (0x100 + ((_buff) * 4))
> -
> -#define VIDW_BUF_SIZE_OFFSET_E(_x) ((((_x) & 0x2000) >> 13) << 27)
> -#define VIDW_BUF_SIZE_OFFSET_MASK (0x1fff << 13)
> -#define VIDW_BUF_SIZE_OFFSET_SHIFT (13)
> -#define VIDW_BUF_SIZE_OFFSET_LIMIT (0x1fff)
> -#define VIDW_BUF_SIZE_OFFSET(_x) (((_x) & 0x1fff) << 13)
> -
> -#define VIDW_BUF_SIZE_PAGEWIDTH_E(_x) ((((_x) & 0x2000) >> 13) << 26)
> -#define VIDW_BUF_SIZE_PAGEWIDTH_MASK (0x1fff << 0)
> -#define VIDW_BUF_SIZE_PAGEWIDTH_SHIFT (0)
> -#define VIDW_BUF_SIZE_PAGEWIDTH_LIMIT (0x1fff)
> -#define VIDW_BUF_SIZE_PAGEWIDTH(_x) (((_x) & 0x1fff) << 0)
> -
> -/* Interrupt controls and status */
> -
> -#define VIDINTCON0_FIFOINTERVAL_MASK (0x3f << 20)
> -#define VIDINTCON0_FIFOINTERVAL_SHIFT (20)
> -#define VIDINTCON0_FIFOINTERVAL_LIMIT (0x3f)
> -#define VIDINTCON0_FIFOINTERVAL(_x) ((_x) << 20)
> -
> -#define VIDINTCON0_INT_SYSMAINCON (1 << 19)
> -#define VIDINTCON0_INT_SYSSUBCON (1 << 18)
> -#define VIDINTCON0_INT_I80IFDONE (1 << 17)
> -
> -#define VIDINTCON0_FRAMESEL0_MASK (0x3 << 15)
> -#define VIDINTCON0_FRAMESEL0_SHIFT (15)
> -#define VIDINTCON0_FRAMESEL0_BACKPORCH (0x0 << 15)
> -#define VIDINTCON0_FRAMESEL0_VSYNC (0x1 << 15)
> -#define VIDINTCON0_FRAMESEL0_ACTIVE (0x2 << 15)
> -#define VIDINTCON0_FRAMESEL0_FRONTPORCH (0x3 << 15)
> -
> -#define VIDINTCON0_FRAMESEL1 (1 << 13)
> -#define VIDINTCON0_FRAMESEL1_MASK (0x3 << 13)
> -#define VIDINTCON0_FRAMESEL1_NONE (0x0 << 13)
> -#define VIDINTCON0_FRAMESEL1_BACKPORCH (0x1 << 13)
> -#define VIDINTCON0_FRAMESEL1_VSYNC (0x2 << 13)
> -#define VIDINTCON0_FRAMESEL1_FRONTPORCH (0x3 << 13)
> -
> -#define VIDINTCON0_INT_FRAME (1 << 12)
> -#define VIDINTCON0_FIFIOSEL_MASK (0x7f << 5)
> -#define VIDINTCON0_FIFIOSEL_SHIFT (5)
> -#define VIDINTCON0_FIFIOSEL_WINDOW0 (0x1 << 5)
> -#define VIDINTCON0_FIFIOSEL_WINDOW1 (0x2 << 5)
> -
> -#define VIDINTCON0_FIFOLEVEL_MASK (0x7 << 2)
> -#define VIDINTCON0_FIFOLEVEL_SHIFT (2)
> -#define VIDINTCON0_FIFOLEVEL_TO25PC (0x0 << 2)
> -#define VIDINTCON0_FIFOLEVEL_TO50PC (0x1 << 2)
> -#define VIDINTCON0_FIFOLEVEL_TO75PC (0x2 << 2)
> -#define VIDINTCON0_FIFOLEVEL_EMPTY (0x3 << 2)
> -#define VIDINTCON0_FIFOLEVEL_FULL (0x4 << 2)
> -
> -#define VIDINTCON0_INT_FIFO_MASK (0x3 << 0)
> -#define VIDINTCON0_INT_FIFO_SHIFT (0)
> -#define VIDINTCON0_INT_ENABLE (1 << 0)
> -
> -#define VIDINTCON1 (0x134)
> -#define VIDINTCON1_INT_I180 (1 << 2)
> -#define VIDINTCON1_INT_FRAME (1 << 1)
> -#define VIDINTCON1_INT_FIFO (1 << 0)
> -
> -/* Window colour-key control registers */
> -#define WKEYCON (0x140) /* 6410,V210 */
> -
> -#define WKEYCON0 (0x00)
> -#define WKEYCON1 (0x04)
> -
> -#define WxKEYCON0_KEYBL_EN (1 << 26)
> -#define WxKEYCON0_KEYEN_F (1 << 25)
> -#define WxKEYCON0_DIRCON (1 << 24)
> -#define WxKEYCON0_COMPKEY_MASK (0xffffff << 0)
> -#define WxKEYCON0_COMPKEY_SHIFT (0)
> -#define WxKEYCON0_COMPKEY_LIMIT (0xffffff)
> -#define WxKEYCON0_COMPKEY(_x) ((_x) << 0)
> -#define WxKEYCON1_COLVAL_MASK (0xffffff << 0)
> -#define WxKEYCON1_COLVAL_SHIFT (0)
> -#define WxKEYCON1_COLVAL_LIMIT (0xffffff)
> -#define WxKEYCON1_COLVAL(_x) ((_x) << 0)
> -
> -
> -/* Window blanking (MAP) */
> -
> -#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)
> -
> -#define WPALCON_PAL_UPDATE (1 << 9)
> -#define WPALCON_W1PAL_MASK (0x7 << 3)
> -#define WPALCON_W1PAL_SHIFT (3)
> -#define WPALCON_W1PAL_25BPP_A888 (0x0 << 3)
> -#define WPALCON_W1PAL_24BPP (0x1 << 3)
> -#define WPALCON_W1PAL_19BPP_A666 (0x2 << 3)
> -#define WPALCON_W1PAL_18BPP_A665 (0x3 << 3)
> -#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)
> -#define WPALCON_W0PAL_24BPP (0x1 << 0)
> -#define WPALCON_W0PAL_19BPP_A666 (0x2 << 0)
> -#define WPALCON_W0PAL_18BPP_A665 (0x3 << 0)
> -#define WPALCON_W0PAL_18BPP (0x4 << 0)
> -#define WPALCON_W0PAL_16BPP_A555 (0x5 << 0)
> -#define WPALCON_W0PAL_16BPP_565 (0x6 << 0)
> -
> -/* Blending equation control */
> -#define BLENDCON (0x260)
> -#define BLENDCON_NEW_MASK (1 << 0)
> -#define BLENDCON_NEW_8BIT_ALPHA_VALUE (1 << 0)
> -#define BLENDCON_NEW_4BIT_ALPHA_VALUE (0 << 0)
> -
> diff --git a/include/video/samsung_fimd.h b/include/video/samsung_fimd.h
> new file mode 100644
> index 0000000..1b5ff4c
> --- /dev/null
> +++ b/include/video/samsung_fimd.h
> @@ -0,0 +1,533 @@
> +/* include/video/samsung_fimd.h
> + *
> + * Copyright 2008 Openmoko, Inc.
> + * Copyright 2008 Simtec Electronics
> + * http://armlinux.simtec.co.uk/
> + * Ben Dooks <ben@simtec.co.uk>
> + *
> + * S3C Platform - new-style fimd and framebuffer register definitions
> + *
> + * This is the register set for the fimd and new style framebuffer interface
> + * found from the S3C2443 onwards into the S3C2416, S3C2450 and the
> + * S3C64XX series such as the S3C6400 and S3C6410.
> + *
> + * The file does not contain the cpu specific items which are based on
> + * whichever architecture is selected, it only contains the core of the
> + * register set. See <mach/regs-fb.h> to get the specifics.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> +*/
> +
> +/* VIDCON0 */
> +
> +#define VIDCON0 (0x00)
> +#define VIDCON0_INTERLACE (1 << 29)
> +#define VIDCON0_VIDOUT_MASK (0x3 << 26)
> +#define VIDCON0_VIDOUT_SHIFT (26)
> +#define VIDCON0_VIDOUT_RGB (0x0 << 26)
> +#define VIDCON0_VIDOUT_TV (0x1 << 26)
> +#define VIDCON0_VIDOUT_I80_LDI0 (0x2 << 26)
> +#define VIDCON0_VIDOUT_I80_LDI1 (0x3 << 26)
> +
> +#define VIDCON0_L1_DATA_MASK (0x7 << 23)
> +#define VIDCON0_L1_DATA_SHIFT (23)
> +#define VIDCON0_L1_DATA_16BPP (0x0 << 23)
> +#define VIDCON0_L1_DATA_18BPP16 (0x1 << 23)
> +#define VIDCON0_L1_DATA_18BPP9 (0x2 << 23)
> +#define VIDCON0_L1_DATA_24BPP (0x3 << 23)
> +#define VIDCON0_L1_DATA_18BPP (0x4 << 23)
> +#define VIDCON0_L1_DATA_16BPP8 (0x5 << 23)
> +
> +#define VIDCON0_L0_DATA_MASK (0x7 << 20)
> +#define VIDCON0_L0_DATA_SHIFT (20)
> +#define VIDCON0_L0_DATA_16BPP (0x0 << 20)
> +#define VIDCON0_L0_DATA_18BPP16 (0x1 << 20)
> +#define VIDCON0_L0_DATA_18BPP9 (0x2 << 20)
> +#define VIDCON0_L0_DATA_24BPP (0x3 << 20)
> +#define VIDCON0_L0_DATA_18BPP (0x4 << 20)
> +#define VIDCON0_L0_DATA_16BPP8 (0x5 << 20)
> +
> +#define VIDCON0_PNRMODE_MASK (0x3 << 17)
> +#define VIDCON0_PNRMODE_SHIFT (17)
> +#define VIDCON0_PNRMODE_RGB (0x0 << 17)
> +#define VIDCON0_PNRMODE_BGR (0x1 << 17)
> +#define VIDCON0_PNRMODE_SERIAL_RGB (0x2 << 17)
> +#define VIDCON0_PNRMODE_SERIAL_BGR (0x3 << 17)
> +
> +#define VIDCON0_CLKVALUP (1 << 16)
> +#define VIDCON0_CLKVAL_F_MASK (0xff << 6)
> +#define VIDCON0_CLKVAL_F_SHIFT (6)
> +#define VIDCON0_CLKVAL_F_LIMIT (0xff)
> +#define VIDCON0_CLKVAL_F(_x) ((_x) << 6)
> +#define VIDCON0_VLCKFREE (1 << 5)
> +#define VIDCON0_CLKDIR (1 << 4)
> +
> +#define VIDCON0_CLKSEL_MASK (0x3 << 2)
> +#define VIDCON0_CLKSEL_SHIFT (2)
> +#define VIDCON0_CLKSEL_HCLK (0x0 << 2)
> +#define VIDCON0_CLKSEL_LCD (0x1 << 2)
> +#define VIDCON0_CLKSEL_27M (0x3 << 2)
> +
> +#define VIDCON0_ENVID (1 << 1)
> +#define VIDCON0_ENVID_F (1 << 0)
> +
> +#define VIDCON1 (0x04)
> +#define VIDCON1_LINECNT_MASK (0x7ff << 16)
> +#define VIDCON1_LINECNT_SHIFT (16)
> +#define VIDCON1_LINECNT_GET(_v) (((_v) >> 16) & 0x7ff)
> +#define VIDCON1_VSTATUS_MASK (0x3 << 13)
> +#define VIDCON1_VSTATUS_SHIFT (13)
> +#define VIDCON1_VSTATUS_VSYNC (0x0 << 13)
> +#define VIDCON1_VSTATUS_BACKPORCH (0x1 << 13)
> +#define VIDCON1_VSTATUS_ACTIVE (0x2 << 13)
> +#define VIDCON1_VSTATUS_FRONTPORCH (0x0 << 13)
> +#define VIDCON1_VCLK_MASK (0x3 << 9)
> +#define VIDCON1_VCLK_HOLD (0x0 << 9)
> +#define VIDCON1_VCLK_RUN (0x1 << 9)
> +
> +#define VIDCON1_INV_VCLK (1 << 7)
> +#define VIDCON1_INV_HSYNC (1 << 6)
> +#define VIDCON1_INV_VSYNC (1 << 5)
> +#define VIDCON1_INV_VDEN (1 << 4)
> +
> +/* VIDCON2 */
> +
> +#define VIDCON2 (0x08)
> +#define VIDCON2_EN601 (1 << 23)
> +#define VIDCON2_TVFMTSEL_SW (1 << 14)
> +
> +#define VIDCON2_TVFMTSEL1_MASK (0x3 << 12)
> +#define VIDCON2_TVFMTSEL1_SHIFT (12)
> +#define VIDCON2_TVFMTSEL1_RGB (0x0 << 12)
> +#define VIDCON2_TVFMTSEL1_YUV422 (0x1 << 12)
> +#define VIDCON2_TVFMTSEL1_YUV444 (0x2 << 12)
> +
> +#define VIDCON2_ORGYCbCr (1 << 8)
> +#define VIDCON2_YUVORDCrCb (1 << 7)
> +
> +/* PRTCON (S3C6410, S5PC100)
> + * Might not be present in the S3C6410 documentation,
> + * but tests prove it's there almost for sure; shouldn't hurt in any case.
> + */
> +#define PRTCON (0x0c)
> +#define PRTCON_PROTECT (1 << 11)
> +
> +/* VIDTCON0 */
> +
> +#define VIDTCON0_VBPDE_MASK (0xff << 24)
> +#define VIDTCON0_VBPDE_SHIFT (24)
> +#define VIDTCON0_VBPDE_LIMIT (0xff)
> +#define VIDTCON0_VBPDE(_x) ((_x) << 24)
> +
> +#define VIDTCON0_VBPD_MASK (0xff << 16)
> +#define VIDTCON0_VBPD_SHIFT (16)
> +#define VIDTCON0_VBPD_LIMIT (0xff)
> +#define VIDTCON0_VBPD(_x) ((_x) << 16)
> +
> +#define VIDTCON0_VFPD_MASK (0xff << 8)
> +#define VIDTCON0_VFPD_SHIFT (8)
> +#define VIDTCON0_VFPD_LIMIT (0xff)
> +#define VIDTCON0_VFPD(_x) ((_x) << 8)
> +
> +#define VIDTCON0_VSPW_MASK (0xff << 0)
> +#define VIDTCON0_VSPW_SHIFT (0)
> +#define VIDTCON0_VSPW_LIMIT (0xff)
> +#define VIDTCON0_VSPW(_x) ((_x) << 0)
> +
> +/* VIDTCON1 */
> +
> +#define VIDTCON1_VFPDE_MASK (0xff << 24)
> +#define VIDTCON1_VFPDE_SHIFT (24)
> +#define VIDTCON1_VFPDE_LIMIT (0xff)
> +#define VIDTCON1_VFPDE(_x) ((_x) << 24)
> +
> +#define VIDTCON1_HBPD_MASK (0xff << 16)
> +#define VIDTCON1_HBPD_SHIFT (16)
> +#define VIDTCON1_HBPD_LIMIT (0xff)
> +#define VIDTCON1_HBPD(_x) ((_x) << 16)
> +
> +#define VIDTCON1_HFPD_MASK (0xff << 8)
> +#define VIDTCON1_HFPD_SHIFT (8)
> +#define VIDTCON1_HFPD_LIMIT (0xff)
> +#define VIDTCON1_HFPD(_x) ((_x) << 8)
> +
> +#define VIDTCON1_HSPW_MASK (0xff << 0)
> +#define VIDTCON1_HSPW_SHIFT (0)
> +#define VIDTCON1_HSPW_LIMIT (0xff)
> +#define VIDTCON1_HSPW(_x) ((_x) << 0)
> +
> +#define VIDTCON2 (0x18)
> +#define VIDTCON2_LINEVAL_E(_x) ((((_x) & 0x800) >> 11) << 23)
> +#define VIDTCON2_LINEVAL_MASK (0x7ff << 11)
> +#define VIDTCON2_LINEVAL_SHIFT (11)
> +#define VIDTCON2_LINEVAL_LIMIT (0x7ff)
> +#define VIDTCON2_LINEVAL(_x) (((_x) & 0x7ff) << 11)
> +
> +#define VIDTCON2_HOZVAL_E(_x) ((((_x) & 0x800) >> 11) << 22)
> +#define VIDTCON2_HOZVAL_MASK (0x7ff << 0)
> +#define VIDTCON2_HOZVAL_SHIFT (0)
> +#define VIDTCON2_HOZVAL_LIMIT (0x7ff)
> +#define VIDTCON2_HOZVAL(_x) (((_x) & 0x7ff) << 0)
> +
> +/* WINCONx */
> +
> +
> +#define WINCONx_BITSWP (1 << 18)
> +#define WINCONx_BYTSWP (1 << 17)
> +#define WINCONx_HAWSWP (1 << 16)
> +#define WINCONx_WSWP (1 << 15)
> +#define WINCONx_BURSTLEN_MASK (0x3 << 9)
> +#define WINCONx_BURSTLEN_SHIFT (9)
> +#define WINCONx_BURSTLEN_16WORD (0x0 << 9)
> +#define WINCONx_BURSTLEN_8WORD (0x1 << 9)
> +#define WINCONx_BURSTLEN_4WORD (0x2 << 9)
> +
> +#define WINCONx_ENWIN (1 << 0)
> +#define WINCON0_BPPMODE_MASK (0xf << 2)
> +#define WINCON0_BPPMODE_SHIFT (2)
> +#define WINCON0_BPPMODE_1BPP (0x0 << 2)
> +#define WINCON0_BPPMODE_2BPP (0x1 << 2)
> +#define WINCON0_BPPMODE_4BPP (0x2 << 2)
> +#define WINCON0_BPPMODE_8BPP_PALETTE (0x3 << 2)
> +#define WINCON0_BPPMODE_16BPP_565 (0x5 << 2)
> +#define WINCON0_BPPMODE_16BPP_1555 (0x7 << 2)
> +#define WINCON0_BPPMODE_18BPP_666 (0x8 << 2)
> +#define WINCON0_BPPMODE_24BPP_888 (0xb << 2)
> +
> +#define WINCON1_BLD_PIX (1 << 6)
> +
> +#define WINCON1_ALPHA_SEL (1 << 1)
> +#define WINCON1_BPPMODE_MASK (0xf << 2)
> +#define WINCON1_BPPMODE_SHIFT (2)
> +#define WINCON1_BPPMODE_1BPP (0x0 << 2)
> +#define WINCON1_BPPMODE_2BPP (0x1 << 2)
> +#define WINCON1_BPPMODE_4BPP (0x2 << 2)
> +#define WINCON1_BPPMODE_8BPP_PALETTE (0x3 << 2)
> +#define WINCON1_BPPMODE_8BPP_1232 (0x4 << 2)
> +#define WINCON1_BPPMODE_16BPP_565 (0x5 << 2)
> +#define WINCON1_BPPMODE_16BPP_A1555 (0x6 << 2)
> +#define WINCON1_BPPMODE_16BPP_I1555 (0x7 << 2)
> +#define WINCON1_BPPMODE_18BPP_666 (0x8 << 2)
> +#define WINCON1_BPPMODE_18BPP_A1665 (0x9 << 2)
> +#define WINCON1_BPPMODE_19BPP_A1666 (0xa << 2)
> +#define WINCON1_BPPMODE_24BPP_888 (0xb << 2)
> +#define WINCON1_BPPMODE_24BPP_A1887 (0xc << 2)
> +#define WINCON1_BPPMODE_25BPP_A1888 (0xd << 2)
> +#define WINCON1_BPPMODE_28BPP_A4888 (0xd << 2)
> +
> +/* S5PV210 */
> +#define SHADOWCON (0x34)
> +#define SHADOWCON_WINx_PROTECT(_win) (1 << (10 + (_win)))
> +/* DMA channels (all windows) */
> +#define SHADOWCON_CHx_ENABLE(_win) (1 << (_win))
> +/* Local input channels (windows 0-2) */
> +#define SHADOWCON_CHx_LOCAL_ENABLE(_win) (1 << (5 + (_win)))
> +
> +#define VIDOSDxA_TOPLEFT_X_E(_x) ((((_x) & 0x800) >> 11) << 23)
> +#define VIDOSDxA_TOPLEFT_X_MASK (0x7ff << 11)
> +#define VIDOSDxA_TOPLEFT_X_SHIFT (11)
> +#define VIDOSDxA_TOPLEFT_X_LIMIT (0x7ff)
> +#define VIDOSDxA_TOPLEFT_X(_x) (((_x) & 0x7ff) << 11)
> +
> +#define VIDOSDxA_TOPLEFT_Y_E(_x) ((((_x) & 0x800) >> 11) << 22)
> +#define VIDOSDxA_TOPLEFT_Y_MASK (0x7ff << 0)
> +#define VIDOSDxA_TOPLEFT_Y_SHIFT (0)
> +#define VIDOSDxA_TOPLEFT_Y_LIMIT (0x7ff)
> +#define VIDOSDxA_TOPLEFT_Y(_x) (((_x) & 0x7ff) << 0)
> +
> +#define VIDOSDxB_BOTRIGHT_X_E(_x) ((((_x) & 0x800) >> 11) << 23)
> +#define VIDOSDxB_BOTRIGHT_X_MASK (0x7ff << 11)
> +#define VIDOSDxB_BOTRIGHT_X_SHIFT (11)
> +#define VIDOSDxB_BOTRIGHT_X_LIMIT (0x7ff)
> +#define VIDOSDxB_BOTRIGHT_X(_x) (((_x) & 0x7ff) << 11)
> +
> +#define VIDOSDxB_BOTRIGHT_Y_E(_x) ((((_x) & 0x800) >> 11) << 22)
> +#define VIDOSDxB_BOTRIGHT_Y_MASK (0x7ff << 0)
> +#define VIDOSDxB_BOTRIGHT_Y_SHIFT (0)
> +#define VIDOSDxB_BOTRIGHT_Y_LIMIT (0x7ff)
> +#define VIDOSDxB_BOTRIGHT_Y(_x) (((_x) & 0x7ff) << 0)
> +
> +/* For VIDOSD[1..4]C */
> +#define VIDISD14C_ALPHA0_R(_x) ((_x) << 20)
> +#define VIDISD14C_ALPHA0_G_MASK (0xf << 16)
> +#define VIDISD14C_ALPHA0_G_SHIFT (16)
> +#define VIDISD14C_ALPHA0_G_LIMIT (0xf)
> +#define VIDISD14C_ALPHA0_G(_x) ((_x) << 16)
> +#define VIDISD14C_ALPHA0_B_MASK (0xf << 12)
> +#define VIDISD14C_ALPHA0_B_SHIFT (12)
> +#define VIDISD14C_ALPHA0_B_LIMIT (0xf)
> +#define VIDISD14C_ALPHA0_B(_x) ((_x) << 12)
> +#define VIDISD14C_ALPHA1_R_MASK (0xf << 8)
> +#define VIDISD14C_ALPHA1_R_SHIFT (8)
> +#define VIDISD14C_ALPHA1_R_LIMIT (0xf)
> +#define VIDISD14C_ALPHA1_R(_x) ((_x) << 8)
> +#define VIDISD14C_ALPHA1_G_MASK (0xf << 4)
> +#define VIDISD14C_ALPHA1_G_SHIFT (4)
> +#define VIDISD14C_ALPHA1_G_LIMIT (0xf)
> +#define VIDISD14C_ALPHA1_G(_x) ((_x) << 4)
> +#define VIDISD14C_ALPHA1_B_MASK (0xf << 0)
> +#define VIDISD14C_ALPHA1_B_SHIFT (0)
> +#define VIDISD14C_ALPHA1_B_LIMIT (0xf)
> +#define VIDISD14C_ALPHA1_B(_x) ((_x) << 0)
> +
> +/* Video buffer addresses */
> +#define VIDW_BUF_START(_buff) (0xA0 + ((_buff) * 8))
> +#define VIDW_BUF_START1(_buff) (0xA4 + ((_buff) * 8))
> +#define VIDW_BUF_END(_buff) (0xD0 + ((_buff) * 8))
> +#define VIDW_BUF_END1(_buff) (0xD4 + ((_buff) * 8))
> +#define VIDW_BUF_SIZE(_buff) (0x100 + ((_buff) * 4))
> +
> +#define VIDW_BUF_SIZE_OFFSET_E(_x) ((((_x) & 0x2000) >> 13) << 27)
> +#define VIDW_BUF_SIZE_OFFSET_MASK (0x1fff << 13)
> +#define VIDW_BUF_SIZE_OFFSET_SHIFT (13)
> +#define VIDW_BUF_SIZE_OFFSET_LIMIT (0x1fff)
> +#define VIDW_BUF_SIZE_OFFSET(_x) (((_x) & 0x1fff) << 13)
> +
> +#define VIDW_BUF_SIZE_PAGEWIDTH_E(_x) ((((_x) & 0x2000) >> 13) << 26)
> +#define VIDW_BUF_SIZE_PAGEWIDTH_MASK (0x1fff << 0)
> +#define VIDW_BUF_SIZE_PAGEWIDTH_SHIFT (0)
> +#define VIDW_BUF_SIZE_PAGEWIDTH_LIMIT (0x1fff)
> +#define VIDW_BUF_SIZE_PAGEWIDTH(_x) (((_x) & 0x1fff) << 0)
> +
> +/* Interrupt controls and status */
> +
> +#define VIDINTCON0_FIFOINTERVAL_MASK (0x3f << 20)
> +#define VIDINTCON0_FIFOINTERVAL_SHIFT (20)
> +#define VIDINTCON0_FIFOINTERVAL_LIMIT (0x3f)
> +#define VIDINTCON0_FIFOINTERVAL(_x) ((_x) << 20)
> +
> +#define VIDINTCON0_INT_SYSMAINCON (1 << 19)
> +#define VIDINTCON0_INT_SYSSUBCON (1 << 18)
> +#define VIDINTCON0_INT_I80IFDONE (1 << 17)
> +
> +#define VIDINTCON0_FRAMESEL0_MASK (0x3 << 15)
> +#define VIDINTCON0_FRAMESEL0_SHIFT (15)
> +#define VIDINTCON0_FRAMESEL0_BACKPORCH (0x0 << 15)
> +#define VIDINTCON0_FRAMESEL0_VSYNC (0x1 << 15)
> +#define VIDINTCON0_FRAMESEL0_ACTIVE (0x2 << 15)
> +#define VIDINTCON0_FRAMESEL0_FRONTPORCH (0x3 << 15)
> +
> +#define VIDINTCON0_FRAMESEL1 (1 << 13)
> +#define VIDINTCON0_FRAMESEL1_MASK (0x3 << 13)
> +#define VIDINTCON0_FRAMESEL1_NONE (0x0 << 13)
> +#define VIDINTCON0_FRAMESEL1_BACKPORCH (0x1 << 13)
> +#define VIDINTCON0_FRAMESEL1_VSYNC (0x2 << 13)
> +#define VIDINTCON0_FRAMESEL1_FRONTPORCH (0x3 << 13)
> +
> +#define VIDINTCON0_INT_FRAME (1 << 12)
> +#define VIDINTCON0_FIFIOSEL_MASK (0x7f << 5)
> +#define VIDINTCON0_FIFIOSEL_SHIFT (5)
> +#define VIDINTCON0_FIFIOSEL_WINDOW0 (0x1 << 5)
> +#define VIDINTCON0_FIFIOSEL_WINDOW1 (0x2 << 5)
> +
> +#define VIDINTCON0_FIFOLEVEL_MASK (0x7 << 2)
> +#define VIDINTCON0_FIFOLEVEL_SHIFT (2)
> +#define VIDINTCON0_FIFOLEVEL_TO25PC (0x0 << 2)
> +#define VIDINTCON0_FIFOLEVEL_TO50PC (0x1 << 2)
> +#define VIDINTCON0_FIFOLEVEL_TO75PC (0x2 << 2)
> +#define VIDINTCON0_FIFOLEVEL_EMPTY (0x3 << 2)
> +#define VIDINTCON0_FIFOLEVEL_FULL (0x4 << 2)
> +
> +#define VIDINTCON0_INT_FIFO_MASK (0x3 << 0)
> +#define VIDINTCON0_INT_FIFO_SHIFT (0)
> +#define VIDINTCON0_INT_ENABLE (1 << 0)
> +
> +#define VIDINTCON1 (0x134)
> +#define VIDINTCON1_INT_I180 (1 << 2)
> +#define VIDINTCON1_INT_FRAME (1 << 1)
> +#define VIDINTCON1_INT_FIFO (1 << 0)
> +
> +/* Window colour-key control registers */
> +#define WKEYCON (0x140) /* 6410,V210 */
> +
> +#define WKEYCON0 (0x00)
> +#define WKEYCON1 (0x04)
> +
> +#define WxKEYCON0_KEYBL_EN (1 << 26)
> +#define WxKEYCON0_KEYEN_F (1 << 25)
> +#define WxKEYCON0_DIRCON (1 << 24)
> +#define WxKEYCON0_COMPKEY_MASK (0xffffff << 0)
> +#define WxKEYCON0_COMPKEY_SHIFT (0)
> +#define WxKEYCON0_COMPKEY_LIMIT (0xffffff)
> +#define WxKEYCON0_COMPKEY(_x) ((_x) << 0)
> +#define WxKEYCON1_COLVAL_MASK (0xffffff << 0)
> +#define WxKEYCON1_COLVAL_SHIFT (0)
> +#define WxKEYCON1_COLVAL_LIMIT (0xffffff)
> +#define WxKEYCON1_COLVAL(_x) ((_x) << 0)
> +
> +
> +/* Window blanking (MAP) */
> +
> +#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)
> +
> +#define WPALCON_PAL_UPDATE (1 << 9)
> +#define WPALCON_W1PAL_MASK (0x7 << 3)
> +#define WPALCON_W1PAL_SHIFT (3)
> +#define WPALCON_W1PAL_25BPP_A888 (0x0 << 3)
> +#define WPALCON_W1PAL_24BPP (0x1 << 3)
> +#define WPALCON_W1PAL_19BPP_A666 (0x2 << 3)
> +#define WPALCON_W1PAL_18BPP_A665 (0x3 << 3)
> +#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)
> +#define WPALCON_W0PAL_24BPP (0x1 << 0)
> +#define WPALCON_W0PAL_19BPP_A666 (0x2 << 0)
> +#define WPALCON_W0PAL_18BPP_A665 (0x3 << 0)
> +#define WPALCON_W0PAL_18BPP (0x4 << 0)
> +#define WPALCON_W0PAL_16BPP_A555 (0x5 << 0)
> +#define WPALCON_W0PAL_16BPP_565 (0x6 << 0)
> +
> +/* Blending equation control */
> +#define BLENDCON (0x260)
> +#define BLENDCON_NEW_MASK (1 << 0)
> +#define BLENDCON_NEW_8BIT_ALPHA_VALUE (1 << 0)
> +#define BLENDCON_NEW_4BIT_ALPHA_VALUE (0 << 0)
> +
> +#define S3C_FB_MAX_WIN (5) /* number of hardware windows available. */
> +#define VIDCON1_FSTATUS_EVEN (1 << 15)
> +
> +/* Video timing controls */
> +#define VIDTCON0 (0x10)
> +#define VIDTCON1 (0x14)
> +#define VIDTCON2 (0x18)
> +
> +/* Window position controls */
> +
> +#define WINCON(_win) (0x20 + ((_win) * 4))
> +
> +/* OSD1 and OSD4 do not have register D */
> +
> +#define VIDOSD_BASE (0x40)
> +
> +#define VIDINTCON0 (0x130)
> +
> +/* WINCONx */
> +
> +#define WINCONx_CSCWIDTH_MASK (0x3 << 26)
> +#define WINCONx_CSCWIDTH_SHIFT (26)
> +#define WINCONx_CSCWIDTH_WIDE (0x0 << 26)
> +#define WINCONx_CSCWIDTH_NARROW (0x3 << 26)
> +
> +#define WINCONx_ENLOCAL (1 << 22)
> +#define WINCONx_BUFSTATUS (1 << 21)
> +#define WINCONx_BUFSEL (1 << 20)
> +#define WINCONx_BUFAUTOEN (1 << 19)
> +#define WINCONx_YCbCr (1 << 13)
> +
> +#define WINCON1_LOCALSEL_CAMIF (1 << 23)
> +
> +#define WINCON2_LOCALSEL_CAMIF (1 << 23)
> +#define WINCON2_BLD_PIX (1 << 6)
> +
> +#define WINCON2_ALPHA_SEL (1 << 1)
> +#define WINCON2_BPPMODE_MASK (0xf << 2)
> +#define WINCON2_BPPMODE_SHIFT (2)
> +#define WINCON2_BPPMODE_1BPP (0x0 << 2)
> +#define WINCON2_BPPMODE_2BPP (0x1 << 2)
> +#define WINCON2_BPPMODE_4BPP (0x2 << 2)
> +#define WINCON2_BPPMODE_8BPP_1232 (0x4 << 2)
> +#define WINCON2_BPPMODE_16BPP_565 (0x5 << 2)
> +#define WINCON2_BPPMODE_16BPP_A1555 (0x6 << 2)
> +#define WINCON2_BPPMODE_16BPP_I1555 (0x7 << 2)
> +#define WINCON2_BPPMODE_18BPP_666 (0x8 << 2)
> +#define WINCON2_BPPMODE_18BPP_A1665 (0x9 << 2)
> +#define WINCON2_BPPMODE_19BPP_A1666 (0xa << 2)
> +#define WINCON2_BPPMODE_24BPP_888 (0xb << 2)
> +#define WINCON2_BPPMODE_24BPP_A1887 (0xc << 2)
> +#define WINCON2_BPPMODE_25BPP_A1888 (0xd << 2)
> +#define WINCON2_BPPMODE_28BPP_A4888 (0xd << 2)
> +
> +#define WINCON3_BLD_PIX (1 << 6)
> +
> +#define WINCON3_ALPHA_SEL (1 << 1)
> +#define WINCON3_BPPMODE_MASK (0xf << 2)
> +#define WINCON3_BPPMODE_SHIFT (2)
> +#define WINCON3_BPPMODE_1BPP (0x0 << 2)
> +#define WINCON3_BPPMODE_2BPP (0x1 << 2)
> +#define WINCON3_BPPMODE_4BPP (0x2 << 2)
> +#define WINCON3_BPPMODE_16BPP_565 (0x5 << 2)
> +#define WINCON3_BPPMODE_16BPP_A1555 (0x6 << 2)
> +#define WINCON3_BPPMODE_16BPP_I1555 (0x7 << 2)
> +#define WINCON3_BPPMODE_18BPP_666 (0x8 << 2)
> +#define WINCON3_BPPMODE_18BPP_A1665 (0x9 << 2)
> +#define WINCON3_BPPMODE_19BPP_A1666 (0xa << 2)
> +#define WINCON3_BPPMODE_24BPP_888 (0xb << 2)
> +#define WINCON3_BPPMODE_24BPP_A1887 (0xc << 2)
> +#define WINCON3_BPPMODE_25BPP_A1888 (0xd << 2)
> +#define WINCON3_BPPMODE_28BPP_A4888 (0xd << 2)
> +
> +#define VIDINTCON0_FIFIOSEL_WINDOW2 (0x10 << 5)
> +#define VIDINTCON0_FIFIOSEL_WINDOW3 (0x20 << 5)
> +#define VIDINTCON0_FIFIOSEL_WINDOW4 (0x40 << 5)
> +
> +#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)
> +#define DITHMODE_R_POS_6BIT (0x1 << 5)
> +#define DITHMODE_R_POS_5BIT (0x2 << 5)
> +
> +#define DITHMODE_G_POS_MASK (0x3 << 3)
> +#define DITHMODE_G_POS_SHIFT (3)
> +#define DITHMODE_G_POS_8BIT (0x0 << 3)
> +#define DITHMODE_G_POS_6BIT (0x1 << 3)
> +#define DITHMODE_G_POS_5BIT (0x2 << 3)
> +
> +#define DITHMODE_B_POS_MASK (0x3 << 1)
> +#define DITHMODE_B_POS_SHIFT (1)
> +#define DITHMODE_B_POS_8BIT (0x0 << 1)
> +#define DITHMODE_B_POS_6BIT (0x1 << 1)
> +#define DITHMODE_B_POS_5BIT (0x2 << 1)
> +
> +#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
> + * 0000 1(P) 1(P) 1(P) 1(P) 1(P)
> + * 0001 2(P) 2(P) 2(P) 2(P) 2(P)
> + * 0010 4(P) 4(P) 4(P) 4(P) -none-
> + * 0011 8(P) 8(P) -none- -none- -none-
> + * 0100 -none- 8(A232) 8(A232) -none- -none-
> + * 0101 16(565) 16(565) 16(565) 16(565) 16(565)
> + * 0110 -none- 16(A555) 16(A555) 16(A555) 16(A555)
> + * 0111 16(I555) 16(I565) 16(I555) 16(I555) 16(I555)
> + * 1000 18(666) 18(666) 18(666) 18(666) 18(666)
> + * 1001 -none- 18(A665) 18(A665) 18(A665) 16(A665)
> + * 1010 -none- 19(A666) 19(A666) 19(A666) 19(A666)
> + * 1011 24(888) 24(888) 24(888) 24(888) 24(888)
> + * 1100 -none- 24(A887) 24(A887) 24(A887) 24(A887)
> + * 1101 -none- 25(A888) 25(A888) 25(A888) 25(A888)
> + * 1110 -none- -none- -none- -none- -none-
> + * 1111 -none- -none- -none- -none- -none-
> +*/
> +
> +/*FIMD V8 REG OFFSET */
> +#define FIMD_V8_VIDTCON0 (0x20010)
> +#define FIMD_V8_VIDTCON1 (0x20014)
> +#define FIMD_V8_VIDTCON2 (0x20018)
> +#define FIMD_V8_VIDTCON3 (0x2001C)
> +#define FIMD_V8_VIDCON1 (0x20004)

CC'ed Marek.

To Leela Krishna Amudala,

Don't add these definitions for FIMD_V8_xxx registers, which are not related to current "regs-fb-v4.h and regs-fb.h".
Just "move" and "merge" regs-fb-v4.h and regs-fb.h to one header file, not "add" new definitions.
If you want to add these definitions, please make new patch for this.

Also, "#define FIMD_V8_xxx" is ugly.
I think that there is better way.
Please, find other way.

> --
> 1.7.0.4