diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-03-19 03:25:41 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-08-07 06:10:56 -0400 |
commit | 343684ffb793a3c371579b7bbc16724713ee5ac7 (patch) | |
tree | 148ad5f2ba60bf529732645624998798c072da90 /arch/arm/plat-mxc | |
parent | d6b515028863a912d051d371b6d71e09f2a9ff19 (diff) |
imxfb: Add support for multiple displays
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/imxfb.h | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/arch/arm/plat-mxc/include/mach/imxfb.h b/arch/arm/plat-mxc/include/mach/imxfb.h index 66259f6158e0..5263506b7ddf 100644 --- a/arch/arm/plat-mxc/include/mach/imxfb.h +++ b/arch/arm/plat-mxc/include/mach/imxfb.h | |||
@@ -2,6 +2,8 @@ | |||
2 | * This structure describes the machine which we are running on. | 2 | * This structure describes the machine which we are running on. |
3 | */ | 3 | */ |
4 | 4 | ||
5 | #include <linux/fb.h> | ||
6 | |||
5 | #define PCR_TFT (1 << 31) | 7 | #define PCR_TFT (1 << 31) |
6 | #define PCR_COLOR (1 << 30) | 8 | #define PCR_COLOR (1 << 30) |
7 | #define PCR_PBSIZ_1 (0 << 28) | 9 | #define PCR_PBSIZ_1 (0 << 28) |
@@ -47,29 +49,21 @@ | |||
47 | #define DMACR_HM(x) (((x) & 0xf) << 16) | 49 | #define DMACR_HM(x) (((x) & 0xf) << 16) |
48 | #define DMACR_TM(x) ((x) & 0xf) | 50 | #define DMACR_TM(x) ((x) & 0xf) |
49 | 51 | ||
50 | struct imx_fb_platform_data { | 52 | struct imx_fb_videomode { |
51 | u_long pixclock; | 53 | struct fb_videomode mode; |
52 | 54 | u32 pcr; | |
53 | u_short xres; | 55 | unsigned char bpp; |
54 | u_short yres; | 56 | }; |
55 | |||
56 | u_int nonstd; | ||
57 | u_char bpp; | ||
58 | u_char hsync_len; | ||
59 | u_char left_margin; | ||
60 | u_char right_margin; | ||
61 | 57 | ||
62 | u_char vsync_len; | 58 | struct imx_fb_platform_data { |
63 | u_char upper_margin; | 59 | struct imx_fb_videomode *mode; |
64 | u_char lower_margin; | 60 | int num_modes; |
65 | u_char sync; | ||
66 | 61 | ||
67 | u_int cmap_greyscale:1, | 62 | u_int cmap_greyscale:1, |
68 | cmap_inverse:1, | 63 | cmap_inverse:1, |
69 | cmap_static:1, | 64 | cmap_static:1, |
70 | unused:29; | 65 | unused:29; |
71 | 66 | ||
72 | u_int pcr; | ||
73 | u_int pwmr; | 67 | u_int pwmr; |
74 | u_int lscr1; | 68 | u_int lscr1; |
75 | u_int dmacr; | 69 | u_int dmacr; |