usb: tegra: fix USB2 powerdown for Tegra30 and later

[karo-tx-uboot.git] / drivers / video / exynos_fimd.c

diff --git a/drivers/video/exynos_fimd.c b/drivers/video/exynos_fimd.c
index 8c2de4ed2947914dc1d2288f6cb5cd94111a8274..cebbba7581e40c26992c6388c3d0552dac76c14b 100644 (file)
--- a/drivers/video/exynos_fimd.c
+++ b/drivers/video/exynos_fimd.c
@@ -4,7 +4,7 @@
  * Author: InKi Dae <inki.dae@samsung.com>
  * Author: Donghwa Lee <dh09.lee@samsung.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+ 
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <config.h>
@@ -73,18 +73,19 @@ static void exynos_fimd_set_par(unsigned int win_id)
        /* DATAPATH is DMA */
        cfg |= EXYNOS_WINCON_DATAPATH_DMA;
 
-       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;
+       cfg |= EXYNOS_WINCON_HAWSWP_ENABLE;
 
        /* dma burst is 16 */
        cfg |= EXYNOS_WINCON_BURSTLEN_16WORD;
 
-       if (pvid->logo_on) /* To get proprietary LOGO */
-               cfg |= EXYNOS_WINCON_BPPMODE_24BPP_888;
-       else /* To get output console on LCD */
+       switch (pvid->vl_bpix) {
+       case 4:
                cfg |= EXYNOS_WINCON_BPPMODE_16BPP_565;
+               break;
+       default:
+               cfg |= EXYNOS_WINCON_BPPMODE_24BPP_888;
+               break;
+       }
 
        writel(cfg, (unsigned int)&fimd_ctrl->wincon0 +
                        EXYNOS_WINCON(win_id));