diff options
| author | Tom Rini <trini@ti.com> | 2013-10-30 08:36:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-10-30 08:36:48 -0400 |
| commit | 509dca7a11aad394d781a9d31a7bfa6692562741 (patch) | |
| tree | c27d8d344c98504ebc8b8b44565813099f18fc04 /drivers | |
| parent | 877bfe37dc00b0ae59f37742954a62bce3fdf3a0 (diff) | |
| parent | 1c6e9de53ba47afacd26fb784818aeb63a01baad (diff) | |
| download | blackbird-obmc-uboot-509dca7a11aad394d781a9d31a7bfa6692562741.tar.gz blackbird-obmc-uboot-509dca7a11aad394d781a9d31a7bfa6692562741.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/cfb_console.c | 38 | ||||
| -rw-r--r-- | drivers/video/formike.c | 7 | ||||
| -rw-r--r-- | drivers/video/ipu_disp.c | 2 |
3 files changed, 25 insertions, 22 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index a2946c71f6..6db4073596 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -2108,6 +2108,24 @@ defined(CONFIG_SANDBOX) || defined(CONFIG_X86) return 0; } +void video_clear(void) +{ + if (!video_fb_address) + return; +#ifdef VIDEO_HW_RECTFILL + video_hw_rectfill(VIDEO_PIXEL_SIZE, /* bytes per pixel */ + 0, /* dest pos x */ + 0, /* dest pos y */ + VIDEO_VISIBLE_COLS, /* frame width */ + VIDEO_VISIBLE_ROWS, /* frame height */ + bgx /* fill color */ + ); +#else + memsetl(video_fb_address, + (VIDEO_VISIBLE_ROWS * VIDEO_LINE_LEN) / sizeof(int), bgx); +#endif +} + static int video_init(void) { unsigned char color8; @@ -2194,6 +2212,8 @@ static int video_init(void) } eorx = fgx ^ bgx; + video_clear(); + #ifdef CONFIG_VIDEO_LOGO /* Plot the logo and get start point of console */ debug("Video: Drawing the logo ...\n"); @@ -2297,21 +2317,3 @@ int video_get_screen_columns(void) { return CONSOLE_COLS; } - -void video_clear(void) -{ - if (!video_fb_address) - return; -#ifdef VIDEO_HW_RECTFILL - video_hw_rectfill(VIDEO_PIXEL_SIZE, /* bytes per pixel */ - 0, /* dest pos x */ - 0, /* dest pos y */ - VIDEO_VISIBLE_COLS, /* frame width */ - VIDEO_VISIBLE_ROWS, /* frame height */ - bgx /* fill color */ - ); -#else - memsetl(video_fb_address, - (VIDEO_VISIBLE_ROWS * VIDEO_LINE_LEN) / sizeof(int), bgx); -#endif -} diff --git a/drivers/video/formike.c b/drivers/video/formike.c index b9b6822138..138315843f 100644 --- a/drivers/video/formike.c +++ b/drivers/video/formike.c @@ -27,10 +27,11 @@ static int spi_write_tag_val(struct spi_slave *spi, unsigned char tag, int ret; buf[0] = tag; - buf[1] = val; - flags |= SPI_XFER_END; + ret = spi_xfer(spi, 8, buf, NULL, flags); + buf[0] = val; + flags = SPI_XFER_END; + ret = spi_xfer(spi, 8, buf, NULL, flags); - ret = spi_xfer(spi, 16, buf, NULL, flags); #ifdef KWH043ST20_F01_SPI_DEBUG printf("spi_write_tag_val: tag=%02X, val=%02X ret: %d\n", tag, val, ret); diff --git a/drivers/video/ipu_disp.c b/drivers/video/ipu_disp.c index 2e913561d0..22ac1429ba 100644 --- a/drivers/video/ipu_disp.c +++ b/drivers/video/ipu_disp.c @@ -1178,7 +1178,7 @@ int32_t ipu_init_sync_panel(int disp, uint32_t pixel_clk, if (sig.Vsync_pol) di_gen |= DI_GEN_POLARITY_3; - if (sig.clk_pol) + if (!sig.clk_pol) di_gen |= DI_GEN_POL_CLK; } |
