aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/sa1100fb.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/sa1100fb.h')
-rw-r--r--drivers/video/sa1100fb.h22
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/video/sa1100fb.h b/drivers/video/sa1100fb.h
index b1d5b089ee4a..77239b766e56 100644
--- a/drivers/video/sa1100fb.h
+++ b/drivers/video/sa1100fb.h
@@ -10,10 +10,12 @@
10 * for more details. 10 * for more details.
11 */ 11 */
12 12
13/* 13#define RGB_4 0
14 * These are the bitfields for each 14#define RGB_8 1
15 * display depth that we support. 15#define RGB_16 2
16 */ 16#define NR_RGB 3
17
18/* These are the bitfields for each display depth that we support. */
17struct sa1100fb_rgb { 19struct sa1100fb_rgb {
18 struct fb_bitfield red; 20 struct fb_bitfield red;
19 struct fb_bitfield green; 21 struct fb_bitfield green;
@@ -21,9 +23,7 @@ struct sa1100fb_rgb {
21 struct fb_bitfield transp; 23 struct fb_bitfield transp;
22}; 24};
23 25
24/* 26/* This structure describes the machine which we are running on. */
25 * This structure describes the machine which we are running on.
26 */
27struct sa1100fb_mach_info { 27struct sa1100fb_mach_info {
28 u_long pixclock; 28 u_long pixclock;
29 29
@@ -47,6 +47,9 @@ struct sa1100fb_mach_info {
47 47
48 u_int lccr0; 48 u_int lccr0;
49 u_int lccr3; 49 u_int lccr3;
50
51 /* Overrides for the default RGB maps */
52 const struct sa1100fb_rgb *rgb[NR_RGB];
50}; 53};
51 54
52/* Shadows for LCD controller registers */ 55/* Shadows for LCD controller registers */
@@ -57,11 +60,6 @@ struct sa1100fb_lcd_reg {
57 unsigned long lccr3; 60 unsigned long lccr3;
58}; 61};
59 62
60#define RGB_4 (0)
61#define RGB_8 (1)
62#define RGB_16 (2)
63#define NR_RGB 3
64
65struct sa1100fb_info { 63struct sa1100fb_info {
66 struct fb_info fb; 64 struct fb_info fb;
67 struct device *dev; 65 struct device *dev;