diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-17 15:04:45 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-17 15:04:45 -0500 |
commit | c613bbba6f39c8804f1f26e96fb68a117cc9e282 (patch) | |
tree | 85fbc24f26b61ce4e7a908d18952e3abc1f5cd10 /arch/arm/mach-imx | |
parent | cd4348339c21f4a15c01f3f120e92b3224a0a7da (diff) | |
parent | 80eee6bca4069c48247005aa07cb5e8e86042aa3 (diff) |
Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r-- | arch/arm/mach-imx/include/mach/imxfb.h | 50 |
1 files changed, 48 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/include/mach/imxfb.h b/arch/arm/mach-imx/include/mach/imxfb.h index 3ed9ec8b9f0..870d0d93961 100644 --- a/arch/arm/mach-imx/include/mach/imxfb.h +++ b/arch/arm/mach-imx/include/mach/imxfb.h | |||
@@ -1,7 +1,52 @@ | |||
1 | /* | 1 | /* |
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 | struct imxfb_mach_info { | 4 | |
5 | #define PCR_TFT (1 << 31) | ||
6 | #define PCR_COLOR (1 << 30) | ||
7 | #define PCR_PBSIZ_1 (0 << 28) | ||
8 | #define PCR_PBSIZ_2 (1 << 28) | ||
9 | #define PCR_PBSIZ_4 (2 << 28) | ||
10 | #define PCR_PBSIZ_8 (3 << 28) | ||
11 | #define PCR_BPIX_1 (0 << 25) | ||
12 | #define PCR_BPIX_2 (1 << 25) | ||
13 | #define PCR_BPIX_4 (2 << 25) | ||
14 | #define PCR_BPIX_8 (3 << 25) | ||
15 | #define PCR_BPIX_12 (4 << 25) | ||
16 | #define PCR_BPIX_16 (4 << 25) | ||
17 | #define PCR_PIXPOL (1 << 24) | ||
18 | #define PCR_FLMPOL (1 << 23) | ||
19 | #define PCR_LPPOL (1 << 22) | ||
20 | #define PCR_CLKPOL (1 << 21) | ||
21 | #define PCR_OEPOL (1 << 20) | ||
22 | #define PCR_SCLKIDLE (1 << 19) | ||
23 | #define PCR_END_SEL (1 << 18) | ||
24 | #define PCR_END_BYTE_SWAP (1 << 17) | ||
25 | #define PCR_REV_VS (1 << 16) | ||
26 | #define PCR_ACD_SEL (1 << 15) | ||
27 | #define PCR_ACD(x) (((x) & 0x7f) << 8) | ||
28 | #define PCR_SCLK_SEL (1 << 7) | ||
29 | #define PCR_SHARP (1 << 6) | ||
30 | #define PCR_PCD(x) ((x) & 0x3f) | ||
31 | |||
32 | #define PWMR_CLS(x) (((x) & 0x1ff) << 16) | ||
33 | #define PWMR_LDMSK (1 << 15) | ||
34 | #define PWMR_SCR1 (1 << 10) | ||
35 | #define PWMR_SCR0 (1 << 9) | ||
36 | #define PWMR_CC_EN (1 << 8) | ||
37 | #define PWMR_PW(x) ((x) & 0xff) | ||
38 | |||
39 | #define LSCR1_PS_RISE_DELAY(x) (((x) & 0x7f) << 26) | ||
40 | #define LSCR1_CLS_RISE_DELAY(x) (((x) & 0x3f) << 16) | ||
41 | #define LSCR1_REV_TOGGLE_DELAY(x) (((x) & 0xf) << 8) | ||
42 | #define LSCR1_GRAY2(x) (((x) & 0xf) << 4) | ||
43 | #define LSCR1_GRAY1(x) (((x) & 0xf)) | ||
44 | |||
45 | #define DMACR_BURST (1 << 31) | ||
46 | #define DMACR_HM(x) (((x) & 0xf) << 16) | ||
47 | #define DMACR_TM(x) ((x) & 0xf) | ||
48 | |||
49 | struct imx_fb_platform_data { | ||
5 | u_long pixclock; | 50 | u_long pixclock; |
6 | 51 | ||
7 | u_short xres; | 52 | u_short xres; |
@@ -34,4 +79,5 @@ struct imxfb_mach_info { | |||
34 | void (*lcd_power)(int); | 79 | void (*lcd_power)(int); |
35 | void (*backlight_power)(int); | 80 | void (*backlight_power)(int); |
36 | }; | 81 | }; |
37 | void set_imx_fb_info(struct imxfb_mach_info *hard_imx_fb_info); | 82 | |
83 | void set_imx_fb_info(struct imx_fb_platform_data *); | ||