From: Hans de Goede Date: Wed, 24 Dec 2014 18:50:11 +0000 (+0100) Subject: sunxi: video: Use sunxi_lcdc_get_clk_delay to calculate tcon1 delay X-Git-Tag: v2015.04-rc1~132 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6741cc78bb66d3be9418c8ffbd1ad162bdce6081;p=oweals%2Fu-boot.git sunxi: video: Use sunxi_lcdc_get_clk_delay to calculate tcon1 delay Use sunxi_lcdc_get_clk_delay to calculate tcon1 delay instead of hardcoding it to 30. We will still end up using 30 for most modes, but for e.g. 800x600 this makes a (small) difference. Signed-off-by: Hans de Goede Acked-by: Ian Campbell --- diff --git a/drivers/video/sunxi_display.c b/drivers/video/sunxi_display.c index 0ce695cc4b..bb18fe2297 100644 --- a/drivers/video/sunxi_display.c +++ b/drivers/video/sunxi_display.c @@ -576,15 +576,15 @@ static void sunxi_lcdc_tcon1_mode_set(const struct ctfb_res_modes *mode, { struct sunxi_lcdc_reg * const lcdc = (struct sunxi_lcdc_reg *)SUNXI_LCD0_BASE; - int bp, total; + int bp, clk_delay, total; /* Use tcon1 */ clrsetbits_le32(&lcdc->ctrl, SUNXI_LCDC_CTRL_IO_MAP_MASK, SUNXI_LCDC_CTRL_IO_MAP_TCON1); - /* Enabled, 0x1e start delay */ + clk_delay = sunxi_lcdc_get_clk_delay(mode); writel(SUNXI_LCDC_TCON1_CTRL_ENABLE | - SUNXI_LCDC_TCON1_CTRL_CLK_DELAY(0x1e), &lcdc->tcon1_ctrl); + SUNXI_LCDC_TCON1_CTRL_CLK_DELAY(clk_delay), &lcdc->tcon1_ctrl); writel(SUNXI_LCDC_X(mode->xres) | SUNXI_LCDC_Y(mode->yres), &lcdc->tcon1_timing_source);