diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-14 15:21:00 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-14 15:21:00 +0100 |
| commit | 1199c377cf14c240b903e351ab02b3b2cd3800c6 (patch) | |
| tree | 8ea274860fc5d3d7a011c2896d865b6976008384 /drivers/video/exynos_fimd.c | |
| parent | 961ffc7759b703e1c574280267e705f2e5f54432 (diff) | |
| parent | e4660e0b7363cdc86519f4af2143b841592a7ffd (diff) | |
| download | u-boot-imx-1199c377cf14c240b903e351ab02b3b2cd3800c6.zip u-boot-imx-1199c377cf14c240b903e351ab02b3b2cd3800c6.tar.gz u-boot-imx-1199c377cf14c240b903e351ab02b3b2cd3800c6.tar.bz2 | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/video/exynos_fimd.c')
| -rw-r--r-- | drivers/video/exynos_fimd.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/video/exynos_fimd.c b/drivers/video/exynos_fimd.c index 06eae2e..2efe6a6 100644 --- a/drivers/video/exynos_fimd.c +++ b/drivers/video/exynos_fimd.c @@ -88,14 +88,18 @@ static void exynos_fimd_set_par(unsigned int win_id) /* DATAPATH is DMA */ cfg |= EXYNOS_WINCON_DATAPATH_DMA; - /* bpp is 32 */ - cfg |= EXYNOS_WINCON_WSWP_ENABLE; + if (pvid->logo_on) /* To get proprietary LOGO */ + cfg |= EXYNOS_WINCON_WSWP_ENABLE; + else /* To get output console on LCD */ + cfg |= EXYNOS_WINCON_HAWSWP_ENABLE; /* dma burst is 16 */ cfg |= EXYNOS_WINCON_BURSTLEN_16WORD; - /* pixel format is unpacked RGB888 */ - cfg |= EXYNOS_WINCON_BPPMODE_24BPP_888; + if (pvid->logo_on) /* To get proprietary LOGO */ + cfg |= EXYNOS_WINCON_BPPMODE_24BPP_888; + else /* To get output console on LCD */ + cfg |= EXYNOS_WINCON_BPPMODE_16BPP_565; writel(cfg, (unsigned int)&fimd_ctrl->wincon0 + EXYNOS_WINCON(win_id)); |