sunxi: display: Add a few extra register and constant defines

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

diff --git a/drivers/video/sunxi_display.c b/drivers/video/sunxi_display.c
index fa4241ef580be82844bfd1de0ae5939067143c82..74a4280e1a4df3ee3d3b604eb52c39ec671ef97e 100644 (file)
--- a/drivers/video/sunxi_display.c
+++ b/drivers/video/sunxi_display.c
@@ -791,7 +791,7 @@ static void sunxi_lcdc_tcon1_mode_set(const struct ctfb_res_modes *mode,
 
        bp = mode->vsync_len + mode->upper_margin;
        total = mode->yres + mode->lower_margin + bp;
-       writel(SUNXI_LCDC_TCON1_TIMING_V_TOTAL(total) |
+       writel(SUNXI_LCDC_TCON1_TIMING_V_TOTAL(2 * total) |
               SUNXI_LCDC_TCON1_TIMING_V_BP(bp), &lcdc->tcon1_timing_v);
 
        writel(SUNXI_LCDC_X(mode->hsync_len) | SUNXI_LCDC_Y(mode->vsync_len),
@@ -944,9 +944,9 @@ static void sunxi_vga_mode_set(void)
        writel(SUNXI_TVE_GCTRL_DAC_INPUT(0, 1) |
               SUNXI_TVE_GCTRL_DAC_INPUT(1, 2) |
               SUNXI_TVE_GCTRL_DAC_INPUT(2, 3), &tve->gctrl);
-       writel(SUNXI_TVE_GCTRL_CFG0_VGA, &tve->cfg0);
-       writel(SUNXI_TVE_GCTRL_DAC_CFG0_VGA, &tve->dac_cfg0);
-       writel(SUNXI_TVE_GCTRL_UNKNOWN1_VGA, &tve->unknown1);
+       writel(SUNXI_TVE_CFG0_VGA, &tve->cfg0);
+       writel(SUNXI_TVE_DAC_CFG0_VGA, &tve->dac_cfg0);
+       writel(SUNXI_TVE_UNKNOWN1_VGA, &tve->unknown1);
 }
 
 static void sunxi_vga_enable(void)