Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-11 07:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-video

Browse source
This commit is contained in:
Tom Rini 2016-04-28 13:15:52 -04:00
commit fccdb287f5
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/video/am335x-fb.c
View file

@ -5,7 +5,7 @@
* minimal framebuffer driver for TI's AM335x SoC to be compatible with * minimal framebuffer driver for TI's AM335x SoC to be compatible with
* Wolfgang Denk's LCD-Framework (CONFIG_LCD, common/lcd.c) * Wolfgang Denk's LCD-Framework (CONFIG_LCD, common/lcd.c)
* *
* - supporting only 24bit RGB/TFT raster Mode (not using palette) * - supporting 16/24/32bit RGB/TFT raster Mode (not using palette)
* - sets up LCD controller as in 'am335x_lcdpanel' struct given * - sets up LCD controller as in 'am335x_lcdpanel' struct given
* - starts output DMA from gd->fb_base buffer * - starts output DMA from gd->fb_base buffer
* *
@ -106,6 +106,8 @@ int lcd_get_size(int *line_length)
int am335xfb_init(struct am335x_lcdpanel *panel) int am335xfb_init(struct am335x_lcdpanel *panel)
{ {
u32 raster_ctrl = 0;
if (0 == gd->fb_base) { if (0 == gd->fb_base) {
printf("ERROR: no valid fb_base stored in GLOBAL_DATA_PTR!\n"); printf("ERROR: no valid fb_base stored in GLOBAL_DATA_PTR!\n");
return -1; return -1;
@ -115,6 +117,21 @@ int am335xfb_init(struct am335x_lcdpanel *panel)
return -1; return -1;
} }
/* We can already set the bits for the raster_ctrl in this check */
switch (panel->bpp) {
case 16:
break;
case 32:
raster_ctrl |= LCD_TFT_24BPP_UNPACK;
/* fallthrough */
case 24:
raster_ctrl |= LCD_TFT_24BPP_MODE;
break;
default:
error("am335x-fb: invalid bpp value: %d\n", panel->bpp);
return -1;
}
debug("setting up LCD-Controller for %dx%dx%d (hfp=%d,hbp=%d,hsw=%d / ", debug("setting up LCD-Controller for %dx%dx%d (hfp=%d,hbp=%d,hsw=%d / ",
panel->hactive, panel->vactive, panel->bpp, panel->hactive, panel->vactive, panel->bpp,
panel->hfp, panel->hbp, panel->hsw); panel->hfp, panel->hbp, panel->hsw);
@ -126,6 +143,8 @@ int am335xfb_init(struct am335x_lcdpanel *panel)
/* palette default entry */ /* palette default entry */
memset((void *)gd->fb_base, 0, 0x20); memset((void *)gd->fb_base, 0, 0x20);
*(unsigned int *)gd->fb_base = 0x4000; *(unsigned int *)gd->fb_base = 0x4000;
/* point fb behind palette */
gd->fb_base += 0x20;
/* turn ON display through powercontrol function if accessible */ /* turn ON display through powercontrol function if accessible */
if (0 != panel->panel_power_ctrl) if (0 != panel->panel_power_ctrl)
@ -137,9 +156,9 @@ int am335xfb_init(struct am335x_lcdpanel *panel)
lcdhw->raster_ctrl = 0; lcdhw->raster_ctrl = 0;
lcdhw->ctrl = LCD_CLK_DIVISOR(panel->pxl_clk_div) | LCD_RASTER_MODE; lcdhw->ctrl = LCD_CLK_DIVISOR(panel->pxl_clk_div) | LCD_RASTER_MODE;
lcdhw->lcddma_fb0_base = gd->fb_base; lcdhw->lcddma_fb0_base = gd->fb_base;
lcdhw->lcddma_fb0_ceiling = gd->fb_base + FBSIZE(panel) + 0x20; lcdhw->lcddma_fb0_ceiling = gd->fb_base + FBSIZE(panel);
lcdhw->lcddma_fb1_base = gd->fb_base; lcdhw->lcddma_fb1_base = gd->fb_base;
lcdhw->lcddma_fb1_ceiling = gd->fb_base + FBSIZE(panel) + 0x20; lcdhw->lcddma_fb1_ceiling = gd->fb_base + FBSIZE(panel);
lcdhw->lcddma_ctrl = LCD_DMA_BURST_SIZE(LCD_DMA_BURST_16); lcdhw->lcddma_ctrl = LCD_DMA_BURST_SIZE(LCD_DMA_BURST_16);
lcdhw->raster_timing0 = LCD_HORLSB(panel->hactive) | lcdhw->raster_timing0 = LCD_HORLSB(panel->hactive) |
@ -157,14 +176,11 @@ int am335xfb_init(struct am335x_lcdpanel *panel)
LCD_HBPMSB(panel->hbp) | LCD_HBPMSB(panel->hbp) |
LCD_HFPMSB(panel->hfp) | LCD_HFPMSB(panel->hfp) |
0x0000FF00; /* clk cycles for ac-bias */ 0x0000FF00; /* clk cycles for ac-bias */
lcdhw->raster_ctrl = LCD_TFT_24BPP_MODE | lcdhw->raster_ctrl = raster_ctrl |
LCD_TFT_24BPP_UNPACK |
LCD_PALMODE_RAWDATA | LCD_PALMODE_RAWDATA |
LCD_TFT_MODE | LCD_TFT_MODE |
LCD_RASTER_ENABLE; LCD_RASTER_ENABLE;
gd->fb_base += 0x20; /* point fb behind palette */
debug("am335x-fb: waiting picture to be stable.\n."); debug("am335x-fb: waiting picture to be stable.\n.");
mdelay(panel->pon_delay); mdelay(panel->pon_delay);