projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-intel-next-2014-07-25-merged' of git://anongit.freedesktop.org/drm...
[firefly-linux-kernel-4.4.55.git]
/
include
/
video
/
samsung_fimd.h
diff --git
a/include/video/samsung_fimd.h
b/include/video/samsung_fimd.h
index b0393209679b083e14aa2adeb5077a20975c3321..eaad58b5be4aa6675842b77b31e7d6dc4217e29b 100644
(file)
--- a/
include/video/samsung_fimd.h
+++ b/
include/video/samsung_fimd.h
@@
-19,6
+19,7
@@
/* VIDCON0 */
#define VIDCON0 0x00
/* VIDCON0 */
#define VIDCON0 0x00
+#define VIDCON0_DSI_EN (1 << 30)
#define VIDCON0_INTERLACE (1 << 29)
#define VIDCON0_VIDOUT_MASK (0x7 << 26)
#define VIDCON0_VIDOUT_SHIFT 26
#define VIDCON0_INTERLACE (1 << 29)
#define VIDCON0_VIDOUT_MASK (0x7 << 26)
#define VIDCON0_VIDOUT_SHIFT 26
@@
-355,7
+356,7
@@
#define VIDINTCON0_INT_ENABLE (1 << 0)
#define VIDINTCON1 0x134
#define VIDINTCON0_INT_ENABLE (1 << 0)
#define VIDINTCON1 0x134
-#define VIDINTCON1_INT_I
180
(1 << 2)
+#define VIDINTCON1_INT_I
80
(1 << 2)
#define VIDINTCON1_INT_FRAME (1 << 1)
#define VIDINTCON1_INT_FIFO (1 << 0)
#define VIDINTCON1_INT_FRAME (1 << 1)
#define VIDINTCON1_INT_FIFO (1 << 0)