diff options
| author | Tom Rini <trini@ti.com> | 2015-02-10 10:41:54 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-10 10:41:54 -0500 |
| commit | 0dac731d1932027f4f813ec7aede35d5e30dec0e (patch) | |
| tree | 522a20ea29730f0b5be03c8ced3b16a37fc165fe /drivers/video/pxa_lcd.c | |
| parent | 307367eaffc8638e10ba1784fc66bfe623ae79e2 (diff) | |
| parent | 7bf71d1f55d31a81ade8dd0fc72f06e4672689d0 (diff) | |
| download | u-boot-imx-0dac731d1932027f4f813ec7aede35d5e30dec0e.zip u-boot-imx-0dac731d1932027f4f813ec7aede35d5e30dec0e.tar.gz u-boot-imx-0dac731d1932027f4f813ec7aede35d5e30dec0e.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Conflicts:
include/splash.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'drivers/video/pxa_lcd.c')
| -rw-r--r-- | drivers/video/pxa_lcd.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/video/pxa_lcd.c b/drivers/video/pxa_lcd.c index f66f615..04105d4 100644 --- a/drivers/video/pxa_lcd.c +++ b/drivers/video/pxa_lcd.c @@ -342,6 +342,12 @@ static int pxafb_init (vidinfo_t *vid); /* --------------- PXA chipset specific functions ------------------- */ /************************************************************************/ +ushort *configuration_get_cmap(void) +{ + struct pxafb_info *fbi = &panel_info.pxa; + return (ushort *)fbi->palette; +} + void lcd_ctrl_init (void *lcdbase) { pxafb_init_mem(lcdbase, &panel_info); |