s5pc110: fb: added evt1 FIMD Driver support.

Signed-off-by: daeinki <inki.dae@samsung.com>

diff --git a/cpu/arm_cortexa8/s5pc1xx/usb_downloader.c b/cpu/arm_cortexa8/s5pc1xx/usb_downloader.c
index e4309d4..c641663 100644 (file)
--- a/cpu/arm_cortexa8/s5pc1xx/usb_downloader.c
+++ b/cpu/arm_cortexa8/s5pc1xx/usb_downloader.c
@@ -101,7 +101,10 @@ static void usb_stop(void)
        s5p_usb_stop();
 #ifdef CONFIG_S5PC1XXFB
        exit_font();
-       s5pc_fimc_lcd_off(1);
+
+       /* it uses fb3 as default window. */
+       s5pc_fimd_lcd_off(3);
+       s5pc_fimd_window_off(3);
 #endif
 }
 

diff --git a/drivers/video/s5p-fimd.c b/drivers/video/s5p-fimd.c
index 0d3d782..6feb66f 100644 (file)
--- a/drivers/video/s5p-fimd.c
+++ b/drivers/video/s5p-fimd.c
@@ -201,27 +201,46 @@ static void s5pc_fimd_lcd_on(unsigned int win_id)
        cfg |= (S5P_VIDCON0_ENVID_ENABLE | S5P_VIDCON0_ENVID_F_ENABLE);
        writel(cfg, ctrl_base + S5P_VIDCON0);
        udebug("vidcon0 = %x\n", cfg);
+}
+
+static void s5pc_fimd_window_on(unsigned int win_id)
+{
+       unsigned int cfg = 0;
 
        /* enable window */
        cfg = readl(ctrl_base + S5P_WINCON(win_id));
        cfg |= S5P_WINCON_ENWIN_ENABLE;
        writel(cfg, ctrl_base + S5P_WINCON(win_id));
        udebug("wincon%d=%x\n", win_id, cfg);
+
+       /* evt1 */
+       cfg = readl(ctrl_base + S5P_WINSHMAP);
+       cfg |= S5P_WINSHMAP_CH_ENABLE(win_id);
+       writel(cfg, ctrl_base + S5P_WINSHMAP);
 }
 
-void s5pc_fimc_lcd_off(unsigned int win_id)
+void s5pc_fimd_lcd_off(unsigned int win_id)
 {
        unsigned int cfg = 0;
 
        cfg = readl(ctrl_base + S5P_VIDCON0);
        cfg &= (S5P_VIDCON0_ENVID_DISABLE | S5P_VIDCON0_ENVID_F_DISABLE);
        writel(cfg, ctrl_base + S5P_VIDCON0);
+}
+
+void s5pc_fimd_window_off(unsigned int win_id)
+{
+       unsigned int cfg = 0;
 
        cfg = readl(ctrl_base + S5P_WINCON(win_id));
        cfg &= S5P_WINCON_ENWIN_DISABLE;
        writel(cfg, ctrl_base + S5P_WINCON(win_id));
-}
 
+       /* evt1 */
+       cfg = readl(ctrl_base + S5P_WINSHMAP);
+       cfg &= ~S5P_WINSHMAP_CH_DISABLE(win_id);
+       writel(cfg, ctrl_base + S5P_WINSHMAP);
+}
 
 void s5pc_fimd_lcd_init(vidinfo_t *vid)
 {
@@ -313,6 +332,9 @@ void s5pc_fimd_lcd_init(vidinfo_t *vid)
        /* display on */
        s5pc_fimd_lcd_on(win_id);
 
+       /* window on */
+       s5pc_fimd_window_on(win_id);
+
        udebug("lcd controller init completed.\n");
 
        return;

diff --git a/include/asm-arm/arch-s5pc1xx/regs-fb.h b/include/asm-arm/arch-s5pc1xx/regs-fb.h
index 976a3f4..800bb50 100644 (file)
--- a/include/asm-arm/arch-s5pc1xx/regs-fb.h
+++ b/include/asm-arm/arch-s5pc1xx/regs-fb.h
@@ -30,73 +30,75 @@
 /*
  * Register Map
 */
-#define S5P_VIDCON0            S5P_LCDREG(0x0000)      /* Video control 0 */
-#define S5P_VIDCON1            S5P_LCDREG(0x0004)      /* Video control 1 */
-#define S5P_VIDCON2            S5P_LCDREG(0x0008)      /* Video control 2 */
-#define S5P_PRTCON             S5P_LCDREG(0x000C)      /* Protect control */
-
-#define S5P_VIDTCON0           S5P_LCDREG(0x0010)      /* Video time control 0 */
-#define S5P_VIDTCON1           S5P_LCDREG(0x0014)      /* Video time control 1 */
-#define S5P_VIDTCON2           S5P_LCDREG(0x0018)      /* Video time control 2 */
-
-#define S5P_WINCON0            S5P_LCDREG(0x0020)      /* Window control 0 */
-#define S5P_WINCON1            S5P_LCDREG(0x0024)      /* Window control 1 */
-#define S5P_WINCON2            S5P_LCDREG(0x0028)      /* Window control 2 */
-#define S5P_WINCON3            S5P_LCDREG(0x002C)      /* Window control 3 */
-#define S5P_WINCON4            S5P_LCDREG(0x0030)      /* Window control 4 */
-
-#define S5P_VIDOSD0A           S5P_LCDREG(0x0040)      /* Video Window 0 position control */
-#define S5P_VIDOSD0B           S5P_LCDREG(0x0044)      /* Video Window 0 position control1 */
-#define S5P_VIDOSD0C           S5P_LCDREG(0x0048)      /* Video Window 0 position control */
-
-#define S5P_VIDOSD1A           S5P_LCDREG(0x0050)      /* Video Window 1 position control */
-#define S5P_VIDOSD1B           S5P_LCDREG(0x0054)      /* Video Window 1 position control */
-#define S5P_VIDOSD1C           S5P_LCDREG(0x0058)      /* Video Window 1 position control */
-#define S5P_VIDOSD1D           S5P_LCDREG(0x005C)      /* Video Window 1 position control */
-
-#define S5P_VIDOSD2A           S5P_LCDREG(0x0060)      /* Video Window 2 position control */
-#define S5P_VIDOSD2B           S5P_LCDREG(0x0064)      /* Video Window 2 position control */
-#define S5P_VIDOSD2C           S5P_LCDREG(0x0068)      /* Video Window 2 position control */
-#define S5P_VIDOSD2D           S5P_LCDREG(0x006C)      /* Video Window 2 position control */
-
-#define S5P_VIDOSD3A           S5P_LCDREG(0x0070)      /* Video Window 3 position control */
-#define S5P_VIDOSD3B           S5P_LCDREG(0x0074)      /* Video Window 3 position control */
-#define S5P_VIDOSD3C           S5P_LCDREG(0x0078)      /* Video Window 3 position control */
-
-#define S5P_VIDOSD4A           S5P_LCDREG(0x0080)      /* Video Window 4 position control */
-#define S5P_VIDOSD4B           S5P_LCDREG(0x0084)      /* Video Window 4 position control */
-#define S5P_VIDOSD4C           S5P_LCDREG(0x0088)      /* Video Window 4 position control */
-
-#define S5P_VIDW00ADD0B0       S5P_LCDREG(0x00A0)      /* Window 0 buffer start address, buffer 0 */
-#define S5P_VIDW00ADD0B1       S5P_LCDREG(0x00A4)      /* Window 0 buffer start address, buffer 1 */
-#define S5P_VIDW01ADD0B0       S5P_LCDREG(0x00A8)      /* Window 1 buffer start address, buffer 0 */
-#define S5P_VIDW01ADD0B1       S5P_LCDREG(0x00AC)      /* Window 1 buffer start address, buffer 1 */
-#define S5P_VIDW02ADD0         S5P_LCDREG(0x00B0)      /* Window 2 buffer start address, buffer 0 */
-#define S5P_VIDW03ADD0         S5P_LCDREG(0x00B8)      /* Window 3 buffer start address, buffer 0 */
-#define S5P_VIDW04ADD0         S5P_LCDREG(0x00C0)      /* Window 4 buffer start address, buffer 0 */
-#define S5P_VIDW00ADD1B0       S5P_LCDREG(0x00D0)      /* Window 0 buffer end address, buffer 0 */
-#define S5P_VIDW00ADD1B1       S5P_LCDREG(0x00D4)      /* Window 0 buffer end address, buffer 1 */
-#define S5P_VIDW01ADD1B0       S5P_LCDREG(0x00D8)      /* Window 1 buffer end address, buffer 0 */
-#define S5P_VIDW01ADD1B1       S5P_LCDREG(0x00DC)      /* Window 1 buffer end address, buffer 1 */
-#define S5P_VIDW02ADD1         S5P_LCDREG(0x00E0)      /* Window 2 buffer end address */
-#define S5P_VIDW03ADD1         S5P_LCDREG(0x00E8)      /* Window 3 buffer end address */
-#define S5P_VIDW04ADD1         S5P_LCDREG(0x00F0)      /* Window 4 buffer end address */
-#define S5P_VIDW00ADD2         S5P_LCDREG(0x0100)      /* Window 0 buffer size */
-#define S5P_VIDW01ADD2         S5P_LCDREG(0x0104)      /* Window 1 buffer size */
-#define S5P_VIDW02ADD2         S5P_LCDREG(0x0108)      /* Window 2 buffer size */
-#define S5P_VIDW03ADD2         S5P_LCDREG(0x010C)      /* Window 3 buffer size */
-#define S5P_VIDW04ADD2         S5P_LCDREG(0x0110)      /* Window 4 buffer size */
+#define S5P_VIDCON0            S5P_LCDREG(0x0000)      /* Video control 0 */
+#define S5P_VIDCON1            S5P_LCDREG(0x0004)      /* Video control 1 */
+#define S5P_VIDCON2            S5P_LCDREG(0x0008)      /* Video control 2 */
+#define S5P_PRTCON             S5P_LCDREG(0x000C)      /* Protect control */
+
+#define S5P_VIDTCON0           S5P_LCDREG(0x0010)      /* Video time control 0 */
+#define S5P_VIDTCON1           S5P_LCDREG(0x0014)      /* Video time control 1 */
+#define S5P_VIDTCON2           S5P_LCDREG(0x0018)      /* Video time control 2 */
+
+#define S5P_WINCON0            S5P_LCDREG(0x0020)      /* Window control 0 */
+#define S5P_WINCON1            S5P_LCDREG(0x0024)      /* Window control 1 */
+#define S5P_WINCON2            S5P_LCDREG(0x0028)      /* Window control 2 */
+#define S5P_WINCON3            S5P_LCDREG(0x002C)      /* Window control 3 */
+#define S5P_WINCON4            S5P_LCDREG(0x0030)      /* Window control 4 */
+#define S5P_WINSHMAP           S5P_LCDREG(0x0034)      /* Window Shodow control */
+#define S5P_WINCHMAP2          S5P_LCDREG(0x003C)      /* Channel mapping control register */
+
+#define S5P_VIDOSD0A           S5P_LCDREG(0x0040)      /* Video Window 0 position control */
+#define S5P_VIDOSD0B           S5P_LCDREG(0x0044)      /* Video Window 0 position control1 */
+#define S5P_VIDOSD0C           S5P_LCDREG(0x0048)      /* Video Window 0 position control */
+
+#define S5P_VIDOSD1A           S5P_LCDREG(0x0050)      /* Video Window 1 position control */
+#define S5P_VIDOSD1B           S5P_LCDREG(0x0054)      /* Video Window 1 position control */
+#define S5P_VIDOSD1C           S5P_LCDREG(0x0058)      /* Video Window 1 position control */
+#define S5P_VIDOSD1D           S5P_LCDREG(0x005C)      /* Video Window 1 position control */
+
+#define S5P_VIDOSD2A           S5P_LCDREG(0x0060)      /* Video Window 2 position control */
+#define S5P_VIDOSD2B           S5P_LCDREG(0x0064)      /* Video Window 2 position control */
+#define S5P_VIDOSD2C           S5P_LCDREG(0x0068)      /* Video Window 2 position control */
+#define S5P_VIDOSD2D           S5P_LCDREG(0x006C)      /* Video Window 2 position control */
+
+#define S5P_VIDOSD3A           S5P_LCDREG(0x0070)      /* Video Window 3 position control */
+#define S5P_VIDOSD3B           S5P_LCDREG(0x0074)      /* Video Window 3 position control */
+#define S5P_VIDOSD3C           S5P_LCDREG(0x0078)      /* Video Window 3 position control */
+
+#define S5P_VIDOSD4A           S5P_LCDREG(0x0080)      /* Video Window 4 position control */
+#define S5P_VIDOSD4B           S5P_LCDREG(0x0084)      /* Video Window 4 position control */
+#define S5P_VIDOSD4C           S5P_LCDREG(0x0088)      /* Video Window 4 position control */
+
+#define S5P_VIDW00ADD0B0       S5P_LCDREG(0x00A0)      /* Window 0 buffer start address, buffer 0 */
+#define S5P_VIDW00ADD0B1       S5P_LCDREG(0x00A4)      /* Window 0 buffer start address, buffer 1 */
+#define S5P_VIDW01ADD0B0       S5P_LCDREG(0x00A8)      /* Window 1 buffer start address, buffer 0 */
+#define S5P_VIDW01ADD0B1       S5P_LCDREG(0x00AC)      /* Window 1 buffer start address, buffer 1 */
+#define S5P_VIDW02ADD0         S5P_LCDREG(0x00B0)      /* Window 2 buffer start address, buffer 0 */
+#define S5P_VIDW03ADD0         S5P_LCDREG(0x00B8)      /* Window 3 buffer start address, buffer 0 */
+#define S5P_VIDW04ADD0         S5P_LCDREG(0x00C0)      /* Window 4 buffer start address, buffer 0 */
+#define S5P_VIDW00ADD1B0       S5P_LCDREG(0x00D0)      /* Window 0 buffer end address, buffer 0 */
+#define S5P_VIDW00ADD1B1       S5P_LCDREG(0x00D4)      /* Window 0 buffer end address, buffer 1 */
+#define S5P_VIDW01ADD1B0       S5P_LCDREG(0x00D8)      /* Window 1 buffer end address, buffer 0 */
+#define S5P_VIDW01ADD1B1       S5P_LCDREG(0x00DC)      /* Window 1 buffer end address, buffer 1 */
+#define S5P_VIDW02ADD1         S5P_LCDREG(0x00E0)      /* Window 2 buffer end address */
+#define S5P_VIDW03ADD1         S5P_LCDREG(0x00E8)      /* Window 3 buffer end address */
+#define S5P_VIDW04ADD1         S5P_LCDREG(0x00F0)      /* Window 4 buffer end address */
+#define S5P_VIDW00ADD2         S5P_LCDREG(0x0100)      /* Window 0 buffer size */
+#define S5P_VIDW01ADD2         S5P_LCDREG(0x0104)      /* Window 1 buffer size */
+#define S5P_VIDW02ADD2         S5P_LCDREG(0x0108)      /* Window 2 buffer size */
+#define S5P_VIDW03ADD2         S5P_LCDREG(0x010C)      /* Window 3 buffer size */
+#define S5P_VIDW04ADD2         S5P_LCDREG(0x0110)      /* Window 4 buffer size */
 
 #define S5P_VP1TCON0           S5P_LCDREG(0x0118)      /* VP1 interface timing control 0 */
 #define S5P_VP1TCON1           S5P_LCDREG(0x011C)      /* VP1 interface timing control 1 */
 
 #define S5P_VIDINTCON0         S5P_LCDREG(0x0130)      /* Indicate the Video interrupt control */
-#define S5P_VIDINTCON1         S5P_LCDREG(0x0134)      /* Video Interrupt Pending */
+#define S5P_VIDINTCON1         S5P_LCDREG(0x0134)      /* Video Interrupt Pending */
 
-#define S5P_W1KEYCON0          S5P_LCDREG(0x0140)      /* Color key control */
-#define S5P_W1KEYCON1          S5P_LCDREG(0x0144)      /* Color key value (transparent value) */
-#define S5P_W2KEYCON0          S5P_LCDREG(0x0148)      /* Color key control */
-#define S5P_W2KEYCON1          S5P_LCDREG(0x014C)      /* Color key value (transparent value) */
+#define S5P_W1KEYCON0          S5P_LCDREG(0x0140)      /* Color key control */
+#define S5P_W1KEYCON1          S5P_LCDREG(0x0144)      /* Color key value (transparent value) */
+#define S5P_W2KEYCON0          S5P_LCDREG(0x0148)      /* Color key control */
+#define S5P_W2KEYCON1          S5P_LCDREG(0x014C)      /* Color key value (transparent value) */
 #define S5P_W3KEYCON0          S5P_LCDREG(0x0150)      /* Color key control */
 #define S5P_W3KEYCON1          S5P_LCDREG(0x0154)      /* Color key value (transparent value) */
 #define S5P_W4KEYCON0          S5P_LCDREG(0x0158)      /* Color key control */
@@ -157,27 +159,27 @@
 #define S5P_VIDCON0_PNRMODE_BGR_S              (3 << 17)
 #define S5P_VIDCON0_PNRMODE_MASK               (3 << 17)
 #define S5P_VIDCON0_PNRMODE_SHIFT              (17)
-#define S5P_VIDCON0_CLKVALUP_ALWAYS            (0 << 16)
-#define S5P_VIDCON0_CLKVALUP_START_FRAME       (1 << 16)
-#define S5P_VIDCON0_CLKVALUP_MASK              (1 << 16)
+#define S5P_VIDCON0_CLKVALUP_ALWAYS            (0 << 16)
+#define S5P_VIDCON0_CLKVALUP_START_FRAME       (1 << 16)
+#define S5P_VIDCON0_CLKVALUP_MASK              (1 << 16)
 #define S5P_VIDCON0_CLKVAL_F(x)                        (((x) & 0xff) << 6)
 #define S5P_VIDCON0_VCLKEN_NORMAL              (0 << 5)
 #define S5P_VIDCON0_VCLKEN_FREERUN             (1 << 5)
 #define S5P_VIDCON0_VCLKEN_MASK                        (1 << 5)
-#define S5P_VIDCON0_CLKDIR_DIRECTED            (0 << 4)
-#define S5P_VIDCON0_CLKDIR_DIVIDED             (1 << 4)
+#define S5P_VIDCON0_CLKDIR_DIRECTED            (0 << 4)
+#define S5P_VIDCON0_CLKDIR_DIVIDED             (1 << 4)
 #define S5P_VIDCON0_CLKDIR_MASK                        (1 << 4)
-#define S5P_VIDCON0_CLKSEL_HCLK                        (0 << 2)
-#define S5P_VIDCON0_CLKSEL_SCLK                        (1 << 2)
-#define S5P_VIDCON0_CLKSEL_MASK                        (1 << 2)
-#define S5P_VIDCON0_ENVID_ENABLE               (1 << 1)
-#define S5P_VIDCON0_ENVID_DISABLE              (0 << 1)
-#define S5P_VIDCON0_ENVID_F_ENABLE                     (1 << 0)
-#define S5P_VIDCON0_ENVID_F_DISABLE            (0 << 0)
+#define S5P_VIDCON0_CLKSEL_HCLK                        (0 << 2)
+#define S5P_VIDCON0_CLKSEL_SCLK                        (1 << 2)
+#define S5P_VIDCON0_CLKSEL_MASK                        (1 << 2)
+#define S5P_VIDCON0_ENVID_ENABLE               (1 << 1)
+#define S5P_VIDCON0_ENVID_DISABLE              (0 << 1)
+#define S5P_VIDCON0_ENVID_F_ENABLE             (1 << 0)
+#define S5P_VIDCON0_ENVID_F_DISABLE            (0 << 0)
 
 /* VIDCON1 */
-#define S5P_VIDCON1_IVCLK_FALLING_EDGE                 (0 << 7)
-#define S5P_VIDCON1_IVCLK_RISING_EDGE          (1 << 7)
+#define S5P_VIDCON1_IVCLK_FALLING_EDGE         (0 << 7)
+#define S5P_VIDCON1_IVCLK_RISING_EDGE          (1 << 7)
 #define S5P_VIDCON1_IHSYNC_NORMAL              (0 << 6)
 #define S5P_VIDCON1_IHSYNC_INVERT              (1 << 6)
 #define S5P_VIDCON1_IVSYNC_NORMAL              (0 << 5)
@@ -203,18 +205,18 @@
 /* VIDTCON0 */
 #define S5P_VIDTCON0_VBPDE(x)                  (((x) & 0xff) << 24)
 #define S5P_VIDTCON0_VBPD(x)                   (((x) & 0xff) << 16)
-#define S5P_VIDTCON0_VFPD(x)                   (((x) & 0xff) << 8)
-#define S5P_VIDTCON0_VSPW(x)                   (((x) & 0xff) << 0)
+#define S5P_VIDTCON0_VFPD(x)                   (((x) & 0xff) << 8)
+#define S5P_VIDTCON0_VSPW(x)                   (((x) & 0xff) << 0)
 
 /* VIDTCON1 */
 #define S5P_VIDTCON1_VFPDE(x)                  (((x) & 0xff) << 24)
-#define S5P_VIDTCON1_HBPD(x)                   (((x) & 0xff) << 16)
-#define S5P_VIDTCON1_HFPD(x)                   (((x) & 0xff) << 8)
-#define S5P_VIDTCON1_HSPW(x)                   (((x) & 0xff) << 0)
+#define S5P_VIDTCON1_HBPD(x)                   (((x) & 0xff) << 16)
+#define S5P_VIDTCON1_HFPD(x)                   (((x) & 0xff) << 8)
+#define S5P_VIDTCON1_HSPW(x)                   (((x) & 0xff) << 0)
 
 /* VIDTCON2 */
-#define S5P_VIDTCON2_LINEVAL(x)                (((x) & 0x7ff) << 11)
-#define S5P_VIDTCON2_HOZVAL(x)                 (((x) & 0x7ff) << 0)
+#define S5P_VIDTCON2_LINEVAL(x)                        (((x) & 0x7ff) << 11)
+#define S5P_VIDTCON2_HOZVAL(x)                 (((x) & 0x7ff) << 0)
 
 /* Window 0~4 Control - WINCONx */
 #define S5P_WINCON_DATAPATH_DMA                        (0 << 22)
@@ -239,8 +241,8 @@
 #define S5P_WINCON_WSWP_DISABLE                        (0 << 15)
 #define S5P_WINCON_WSWP_ENABLE                 (1 << 15)
 #define S5P_WINCON_WSWP_SHIFT                  (15)
-#define S5P_WINCON_INRGB_RGB                   (0 << 13)
-#define S5P_WINCON_INRGB_YUV                   (1 << 13)
+#define S5P_WINCON_INRGB_RGB                   (0 << 13)
+#define S5P_WINCON_INRGB_YUV                   (1 << 13)
 #define S5P_WINCON_INRGB_MASK                  (1 << 13)
 #define S5P_WINCON_BURSTLEN_16WORD             (0 << 9)
 #define S5P_WINCON_BURSTLEN_8WORD              (1 << 9)
@@ -270,9 +272,15 @@
 #define S5P_WINCON_ALPHA0_SEL                  (0 << 1)
 #define S5P_WINCON_ALPHA1_SEL                  (1 << 1)
 #define S5P_WINCON_ALPHA_SEL_MASK              (1 << 1)
-#define S5P_WINCON_ENWIN_DISABLE               (0 << 0)
+#define S5P_WINCON_ENWIN_DISABLE               (0 << 0)
 #define S5P_WINCON_ENWIN_ENABLE                        (1 << 0)
 
+/* WINSHMAP */
+#define S5P_WINSHMAP_CH_ENABLE(x)              (1 << x)
+#define S5P_WINSHMAP_CH_DISABLE(x)             (0 << x)
+#define S5P_WINSHMAP_CH_LOCAL_ENABLE(x)                (1 << (x + 5))
+#define S5P_WINSHMAP_CH_LOCAL_DISABLE(x)       (0 << (x + 5))
+
 /* WINCON1 special */
 #define S5P_WINCON1_VP_DISABLE                 (0 << 24)
 #define S5P_WINCON1_VP_ENABLE                  (1 << 24)
@@ -300,14 +308,14 @@
 #define S5P_VIDOSD_ALPHA1_SHIFT                        (0)
 
 /* Start Address */
-#define S5P_VIDADDR_START_VBANK(x)             (((x) & 0xff) << 24)
+#define S5P_VIDADDR_START_VBANK(x)             (((x) & 0xff) << 24)
 #define S5P_VIDADDR_START_VBASEU(x)            (((x) & 0xffffff) << 0)
 
 /* End Address */
-#define S5P_VIDADDR_END_VBASEL(x)              (((x) & 0xffffff) << 0)
+#define S5P_VIDADDR_END_VBASEL(x)              (((x) & 0xffffff) << 0)
 
 /* Buffer Size */
-#define S5P_VIDADDR_OFFSIZE(x)                 (((x) & 0x1fff) << 13)
+#define S5P_VIDADDR_OFFSIZE(x)                 (((x) & 0x1fff) << 13)
 #define S5P_VIDADDR_PAGEWIDTH(x)               (((x) & 0x1fff) << 0)
 
 /* VIDINTCON0 */
@@ -318,16 +326,16 @@
 #define S5P_VIDINTCON0_SYSIFDONE_DISABLE       (0 << 17)
 #define S5P_VIDINTCON0_SYSIFDONE_ENABLE                (1 << 17)
 #define S5P_VIDINTCON0_FRAMESEL0_BACK          (0 << 15)
-#define S5P_VIDINTCON0_FRAMESEL0_VSYNC                 (1 << 15)
+#define S5P_VIDINTCON0_FRAMESEL0_VSYNC         (1 << 15)
 #define S5P_VIDINTCON0_FRAMESEL0_ACTIVE                (2 << 15)
-#define S5P_VIDINTCON0_FRAMESEL0_FRONT                 (3 << 15)
-#define S5P_VIDINTCON0_FRAMESEL0_MASK          (3 << 15)
+#define S5P_VIDINTCON0_FRAMESEL0_FRONT         (3 << 15)
+#define S5P_VIDINTCON0_FRAMESEL0_MASK          (3 << 15)
 #define S5P_VIDINTCON0_FRAMESEL1_NONE          (0 << 13)
 #define S5P_VIDINTCON0_FRAMESEL1_BACK          (1 << 13)
-#define S5P_VIDINTCON0_FRAMESEL1_VSYNC                 (2 << 13)
-#define S5P_VIDINTCON0_FRAMESEL1_FRONT                 (3 << 13)
+#define S5P_VIDINTCON0_FRAMESEL1_VSYNC         (2 << 13)
+#define S5P_VIDINTCON0_FRAMESEL1_FRONT         (3 << 13)
 #define S5P_VIDINTCON0_INTFRMEN_DISABLE                (0 << 12)
-#define S5P_VIDINTCON0_INTFRMEN_ENABLE                 (1 << 12)
+#define S5P_VIDINTCON0_INTFRMEN_ENABLE         (1 << 12)
 #define S5P_VIDINTCON0_FIFOSEL_WIN4            (1 << 11)
 #define S5P_VIDINTCON0_FIFOSEL_WIN3            (1 << 10)
 #define S5P_VIDINTCON0_FIFOSEL_WIN2            (1 << 9)
@@ -338,7 +346,7 @@
 #define S5P_VIDINTCON0_FIFOLEVEL_25            (0 << 2)
 #define S5P_VIDINTCON0_FIFOLEVEL_50            (1 << 2)
 #define S5P_VIDINTCON0_FIFOLEVEL_75            (2 << 2)
-#define S5P_VIDINTCON0_FIFOLEVEL_EMPTY                 (3 << 2)
+#define S5P_VIDINTCON0_FIFOLEVEL_EMPTY         (3 << 2)
 #define S5P_VIDINTCON0_FIFOLEVEL_FULL          (4 << 2)
 #define S5P_VIDINTCON0_FIFOLEVEL_MASK          (7 << 2)
 #define S5P_VIDINTCON0_INTFIFO_DISABLE         (0 << 1)
@@ -354,9 +362,9 @@
 #define S5P_VIDINTCON1_INTFIFOPEND             (1 << 0)
 
 /* WxKEYCON0 (1~4) */
-#define S5P_KEYCON0_KEYBLEN_DISABLE            (0 << 26)
+#define S5P_KEYCON0_KEYBLEN_DISABLE            (0 << 26)
 #define S5P_KEYCON0_KEYBLEN_ENABLE             (1 << 26)
-#define S5P_KEYCON0_KEY_DISABLE                (0 << 25)
+#define S5P_KEYCON0_KEY_DISABLE                (0 << 25)
 #define S5P_KEYCON0_KEY_ENABLE                 (1 << 25)
 #define S5P_KEYCON0_DIRCON_MATCH_FG            (0 << 24)
 #define S5P_KEYCON0_DIRCON_MATCH_BG            (1 << 24)
@@ -366,12 +374,12 @@
 #define S5P_KEYCON1_COLVAL(x)                  (((x) & 0xffffff) << 0)
 
 /* DUALRGB */
-#define S5P_DUALRGB_BYPASS_SINGLE              (0x00 << 0)                             
+#define S5P_DUALRGB_BYPASS_SINGLE              (0x00 << 0)
 #define S5P_DUALRGB_BYPASS_DUAL                        (0x01 << 0)
 #define S5P_DUALRGB_MIE_DUAL                   (0x10 << 0)
 #define S5P_DUALRGB_MIE_SINGLE                 (0x11 << 0)
-#define S5P_DUALRGB_LINESPLIT                  (0x0 << 2) 
-#define S5P_DUALRGB_FRAMESPLIT                 (0x1 << 2) 
+#define S5P_DUALRGB_LINESPLIT                  (0x0 << 2)
+#define S5P_DUALRGB_FRAMESPLIT                 (0x1 << 2)
 #define S5P_DUALRGB_SUB_CNT(x)                 ((x & 0xfff) << 4)
 #define S5P_DUALRGB_VDEN_EN_DISABLE            (0x0 << 16)
 #define S5P_DUALRGB_VDEN_EN_ENABLE             (0x1 << 16)