]> Pileus Git - ~andy/linux/commitdiff
video: s3c-fb: move the address definition for VIDOSD register
authorJingoo Han <jg1.han@samsung.com>
Tue, 25 Sep 2012 07:43:16 +0000 (16:43 +0900)
committerJingoo Han <jg1.han@samsung.com>
Mon, 26 Nov 2012 04:35:35 +0000 (13:35 +0900)
The address definition for VIDTCON VIDOSD is moved to right
place.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
include/video/samsung_fimd.h

index bc22f3ccb7b1dbb452821f6cc9793f4b8c7748bc..c398728cacfb9d94dd2f9dd3121278db307b6a9b 100644 (file)
 /* 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)
 #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)