mmc: mmc_legacy: fix the compiler error with disabled CONFIG_DM_MMC_OPS

[oweals/u-boot.git] / drivers / video / ipu_disp.c

diff --git a/drivers/video/ipu_disp.c b/drivers/video/ipu_disp.c
index 4faeafb6351d4d3e75376e704b479ebad4a3c6b3..cbac9f72fcb3ba7249278e5d1b97238151b4d741 100644 (file)
--- a/drivers/video/ipu_disp.c
+++ b/drivers/video/ipu_disp.c
@@ -611,11 +611,9 @@ void ipu_dp_dc_enable(ipu_channel_t channel)
        uint32_t reg;
        uint32_t dc_chan;
 
-       if (channel == MEM_FG_SYNC)
-               dc_chan = 5;
        if (channel == MEM_DC_SYNC)
                dc_chan = 1;
-       else if (channel == MEM_BG_SYNC)
+       else if ((channel == MEM_BG_SYNC) || (channel == MEM_FG_SYNC))
                dc_chan = 5;
        else
                return;
@@ -1119,7 +1117,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) {