diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-06-07 23:42:17 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-06-07 23:42:17 +0200 |
| commit | fedab338f3459315cb69627fcf46032ec8df1753 (patch) | |
| tree | f3364476201839514e578be0938832620be18244 /include/lcd.h | |
| parent | 74b5b5dbc3345a8fad4bc798f8f88d07d2ef0008 (diff) | |
| parent | f6b690e65c0aa5f3da22546ac597d9f01cff2e4e (diff) | |
| download | olio-uboot-2014.01-fedab338f3459315cb69627fcf46032ec8df1753.tar.xz olio-uboot-2014.01-fedab338f3459315cb69627fcf46032ec8df1753.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-video
* 'master' of git://git.denx.de/u-boot-video:
video: atmel/lcd: add LCD driver for new Atmel SoC
video: cfb_console: flush dcache for frame buffer in DRAM
cfb_console: Ignore bell character
cfb_console: Add console_clear_line function
cfb_console: Fix function console_back
omap3_dss: cosmetic changes
omap3_dss: add optional framebuffer
mx53loco: Add LCD support
mx5: Rename mx51_fb_init()
mx53: Allow IPUv3 driver to also work on mx53
mx51evk: Add LCD support
EXYNOS: display 32bpp bitmap TIZEN logo
create lib/tizen directory
LCD: display 32bpp decompressed bitmap image
common/lcd.c: reduce one CONFIG_LCD_LOGO ifdef
common/lcd.c: reduce some CONFIG_LCD_*_LOGO ifdefs
common/lcd.c: use ARRAY_SIZE
cmd_bmp.c: make bmp_display() usable by drivers or board code
LCD: support another s6e8ax0 panel type
LCD: change s6e8ax0 panel gamma value
include/video.h: drop unused video_printf()
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/lcd.h')
| -rw-r--r-- | include/lcd.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/include/lcd.h b/include/lcd.h index 3d9ef1671..6e0a2a391 100644 --- a/include/lcd.h +++ b/include/lcd.h @@ -55,6 +55,7 @@ extern void lcd_initcolregs (void); /* gunzip_bmp used if CONFIG_VIDEO_BMP_GZIP */ extern struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp); +extern int bmp_display(ulong addr, int x, int y); #if defined CONFIG_MPC823 /* @@ -157,7 +158,7 @@ typedef struct vidinfo { struct pxafb_info pxa; } vidinfo_t; -#elif defined(CONFIG_ATMEL_LCD) +#elif defined(CONFIG_ATMEL_LCD) || defined(CONFIG_ATMEL_HLCD) typedef struct vidinfo { ushort vl_col; /* Number of columns (i.e. 640) */ @@ -169,6 +170,7 @@ typedef struct vidinfo { u_long vl_bpix; /* Bits per pixel, 0 = 1, 1 = 2, 2 = 4, 3 = 8, 4 = 16 */ u_long vl_tft; /* 0 = passive, 1 = TFT */ u_long vl_cont_pol_low; /* contrast polarity is low */ + u_long vl_clk_pol; /* clock polarity */ /* Horizontal control register. */ u_long vl_hsync_len; /* Length of horizontal sync */ @@ -190,6 +192,13 @@ enum { FIMD_CPU_INTERFACE = 2, }; +enum exynos_fb_rgb_mode_t { + MODE_RGB_P = 0, + MODE_BGR_P = 1, + MODE_RGB_S = 2, + MODE_BGR_S = 3, +}; + typedef struct vidinfo { ushort vl_col; /* Number of columns (i.e. 640) */ ushort vl_row; /* Number of rows (i.e. 480) */ @@ -235,6 +244,12 @@ typedef struct vidinfo { unsigned int wr_setup; unsigned int wr_act; unsigned int wr_hold; + unsigned int logo_on; + unsigned int logo_width; + unsigned int logo_height; + unsigned long logo_addr; + unsigned int rgb_mode; + unsigned int resolution; /* parent clock name(MPLL, EPLL or VPLL) */ unsigned int pclk_name; |