diff options
| author | Tom Rini | 2015-11-30 07:10:18 -0500 |
|---|---|---|
| committer | Tom Rini | 2015-11-30 07:10:18 -0500 |
| commit | c1924d85af4a07dc70aef1ef95c48b54a136733f (patch) | |
| tree | 78b34b2dd76db0a975cd3008dca3cd10362389da | |
| parent | f1df81c4008c8e0edbc1a2738cf2490b2f7be661 (diff) | |
| parent | 3dbdb4dd4f8e5847b8f7d6dbd849e0b9a0907a5b (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-video
| -rw-r--r-- | common/lcd.c | 13 | ||||
| -rw-r--r-- | drivers/video/ipu_disp.c | 2 | ||||
| -rw-r--r-- | drivers/video/ipu_regs.h | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/common/lcd.c b/common/lcd.c index d29308aeb6a..ed68be93255 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -143,6 +143,16 @@ __weak int lcd_get_size(int *line_length) 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) { struct stdio_dev lcddev; @@ -152,6 +162,9 @@ int drv_lcd_init(void) lcd_init(lcd_base); + if (board_lcd_console_skip()) + return 0; + /* Device initialization */ memset(&lcddev, 0, sizeof(lcddev)); diff --git a/drivers/video/ipu_disp.c b/drivers/video/ipu_disp.c index 4faeafb6351..e08ddd4a4e9 100644 --- a/drivers/video/ipu_disp.c +++ b/drivers/video/ipu_disp.c @@ -1119,7 +1119,7 @@ int32_t ipu_init_sync_panel(int disp, uint32_t pixel_clk, reg &= 0x0000FFFF; __raw_writel(reg, DI_STP_REP(disp, 6)); __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 */ if (disp) { diff --git a/drivers/video/ipu_regs.h b/drivers/video/ipu_regs.h index c2c134a7de0..0d3fe069e91 100644 --- a/drivers/video/ipu_regs.h +++ b/drivers/video/ipu_regs.h @@ -338,6 +338,7 @@ struct ipu_dmfc { #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_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_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]) |