diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2015-08-03 19:45:37 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2015-08-08 16:26:20 +0200 |
| commit | 0ecb43a8d054f0252256d44f3a06e56fd8370446 (patch) | |
| tree | 4877d9b73f2e31205382149239cf3f481c69c36b /drivers | |
| parent | ab2a2be988b571bf6b96bb00b6edf122c1cf9ddc (diff) | |
| download | talos-obmc-uboot-0ecb43a8d054f0252256d44f3a06e56fd8370446.tar.gz talos-obmc-uboot-0ecb43a8d054f0252256d44f3a06e56fd8370446.zip | |
sunxi: display: Add a few extra register and constant defines
Add a few extra sunxi display registers and constant defines.
Also rename some existing defines (e.g. dropping _GCTRL) and make
some more generic (e.g. dropping the 2x scaling from
SUNXI_LCDC_TCON1_TIMING_V_TOTAL).
This is a preparation patch for adding composite video out support.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/sunxi_display.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/sunxi_display.c b/drivers/video/sunxi_display.c index fa4241ef58..74a4280e1a 100644 --- 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) |
