summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2012-09-25 16:43:16 +0900
committerJingoo Han <jg1.han@samsung.com>2012-11-26 13:35:35 +0900
commit99a2c61e639063803348c71c760c2fc272e83ec6 (patch)
tree871d709c68244b4a9f57a5ea4362fc65bb408fd3
parent9d07a0bf444c7bafc940ea8f3ba1b1bbbed09793 (diff)
video: s3c-fb: move the address definition for VIDOSD register
The address definition for VIDTCON VIDOSD is moved to right place. Signed-off-by: Jingoo Han <jg1.han@samsung.com>
-rw-r--r--include/video/samsung_fimd.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/video/samsung_fimd.h b/include/video/samsung_fimd.h
index bc22f3ccb7b..c398728cacf 100644
--- a/include/video/samsung_fimd.h
+++ b/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)