Skip to content

Commit

Permalink
video: s3c-fb: move the address definition for VIDOSD register
Browse files Browse the repository at this point in the history
The address definition for VIDTCON VIDOSD is moved to right
place.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
  • Loading branch information
Jingoo Han committed Nov 26, 2012
1 parent 9d07a0b commit 99a2c61
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions include/video/samsung_fimd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 99a2c61

Please sign in to comment.