From 1bac3e495d51ff442c1307a6ae57e1aedc3b20a6 Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Tue, 25 Sep 2012 16:43:16 +0900 Subject: [PATCH] --- yaml --- r: 344535 b: refs/heads/master c: 99a2c61e639063803348c71c760c2fc272e83ec6 h: refs/heads/master i: 344533: 9ad9a426b0c2c5519461996b117c1faee639136a 344531: ec143f9a7f70ace2369deaea18ef9f30741e462b 344527: 1fbc264cda118ec3dfdeb454e052184d4cc562ce v: v3 --- [refs] | 2 +- trunk/include/video/samsung_fimd.h | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7d97135ed4f1..b8c2f9c86e14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d07a0bf444c7bafc940ea8f3ba1b1bbbed09793 +refs/heads/master: 99a2c61e639063803348c71c760c2fc272e83ec6 diff --git a/trunk/include/video/samsung_fimd.h b/trunk/include/video/samsung_fimd.h index bc22f3ccb7b1..c398728cacfb 100644 --- a/trunk/include/video/samsung_fimd.h +++ b/trunk/include/video/samsung_fimd.h @@ -237,6 +237,9 @@ /* Local input channels (windows 0-2) */ #define SHADOWCON_CHx_LOCAL_ENABLE(_win) (1 << (5 + (_win))) +/* VIDOSDx */ + +#define VIDOSD_BASE (0x40) #define VIDOSDxA_TOPLEFT_X_E(_x) ((((_x) & 0x800) >> 11) << 23) #define VIDOSDxA_TOPLEFT_X_MASK (0x7ff << 11) #define VIDOSDxA_TOPLEFT_X_SHIFT (11) @@ -408,10 +411,6 @@ #define S3C_FB_MAX_WIN (5) /* number of hardware windows available. */ #define VIDCON1_FSTATUS_EVEN (1 << 15) -/* OSD1 and OSD4 do not have register D */ - -#define VIDOSD_BASE (0x40) - #define VIDINTCON0 (0x130) #define VIDINTCON0_FIFIOSEL_WINDOW2 (0x10 << 5)