V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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

This commit is contained in:
Tom Rini 2015-11-30 07:10:18 -05:00
parent f1df81c400 3dbdb4dd4f
commit c1924d85af
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/lcd.c
View File

@ -143,6 +143,16 @@ __weak int lcd_get_size(int *line_length)
return *line_length * panel_info.vl_row; return *line_length * panel_info.vl_row;
} }
/*
* Implement a weak default function for boards that optionally
* need to skip the lcd console initialization.
*/
__weak int board_lcd_console_skip(void)
{
/* As default, don't skip cfb init */
return 0;
}
int drv_lcd_init(void) int drv_lcd_init(void)
{ {
struct stdio_dev lcddev; struct stdio_dev lcddev;
@ -152,6 +162,9 @@ int drv_lcd_init(void)
lcd_init(lcd_base); lcd_init(lcd_base);
if (board_lcd_console_skip())
return 0;
/* Device initialization */ /* Device initialization */
memset(&lcddev, 0, sizeof(lcddev)); memset(&lcddev, 0, sizeof(lcddev));

2
drivers/video/ipu_disp.c
View File

@ -1119,7 +1119,7 @@ int32_t ipu_init_sync_panel(int disp, uint32_t pixel_clk,
reg &= 0x0000FFFF; reg &= 0x0000FFFF;
__raw_writel(reg, DI_STP_REP(disp, 6)); __raw_writel(reg, DI_STP_REP(disp, 6));
__raw_writel(0, DI_STP_REP(disp, 7)); __raw_writel(0, DI_STP_REP(disp, 7));
__raw_writel(0, DI_STP_REP(disp, 9)); __raw_writel(0, DI_STP_REP9(disp));
/* Init template microcode */ /* Init template microcode */
if (disp) { if (disp) {

1
drivers/video/ipu_regs.h
View File

@ -338,6 +338,7 @@ struct ipu_dmfc {
#define DI_SW_GEN0(di, gen) (&DI_REG(di)->sw_gen0[gen - 1]) #define DI_SW_GEN0(di, gen) (&DI_REG(di)->sw_gen0[gen - 1])
#define DI_SW_GEN1(di, gen) (&DI_REG(di)->sw_gen1[gen - 1]) #define DI_SW_GEN1(di, gen) (&DI_REG(di)->sw_gen1[gen - 1])
#define DI_STP_REP(di, gen) (&DI_REG(di)->stp_rep[(gen - 1) / 2]) #define DI_STP_REP(di, gen) (&DI_REG(di)->stp_rep[(gen - 1) / 2])
#define DI_STP_REP9(di) (&DI_REG(di)->stp_rep9)
#define DI_SYNC_AS_GEN(di) (&DI_REG(di)->sync_as) #define DI_SYNC_AS_GEN(di) (&DI_REG(di)->sync_as)
#define DI_DW_GEN(di, gen) (&DI_REG(di)->dw_gen[gen]) #define DI_DW_GEN(di, gen) (&DI_REG(di)->dw_gen[gen])
#define DI_DW_SET(di, gen, set) (&DI_REG(di)->dw_set[gen + 12 * set]) #define DI_DW_SET(di, gen, set) (&DI_REG(di)->dw_set[gen + 12 * set])