diff options
| author | Mark Jackson <mpfj-list@mimc.co.uk> | 2009-06-29 15:59:10 +0100 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2009-06-30 16:22:35 +0200 |
| commit | 6bbced671719518d0e28ff422623cd7ce396cbda (patch) | |
| tree | e6bdfe2e5abf78463dd6898a42839bd318ff9b39 /drivers | |
| parent | 3e88337b225bf796f6df21d0a7f591530e9d4ce0 (diff) | |
Atmel LCD driver GUARDTIME fix
This patch allows the guard time parameter to be set in
the Atmel LCDC driver.
By default, the previous value of 1 is used, unless the
setting is defined elsewhere.
Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/atmel_lcdfb.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 3a51cc7c56..db867638f6 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -42,6 +42,9 @@ short console_row; /* configurable parameters */ #define ATMEL_LCDC_CVAL_DEFAULT 0xc8 #define ATMEL_LCDC_DMA_BURST_LEN 8 +#ifndef ATMEL_LCDC_GUARD_TIME +#define ATMEL_LCDC_GUARD_TIME 1 +#endif #if defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91CAP9) #define ATMEL_LCDC_FIFO_SIZE 2048 @@ -69,7 +72,7 @@ void lcd_ctrl_init(void *lcdbase) /* Turn off the LCD controller and the DMA controller */ lcdc_writel(panel_info.mmio, ATMEL_LCDC_PWRCON, - 1 << ATMEL_LCDC_GUARDT_OFFSET); + ATMEL_LCDC_GUARD_TIME << ATMEL_LCDC_GUARDT_OFFSET); /* Wait for the LCDC core to become idle */ while (lcdc_readl(panel_info.mmio, ATMEL_LCDC_PWRCON) & ATMEL_LCDC_BUSY) @@ -150,7 +153,7 @@ void lcd_ctrl_init(void *lcdbase) lcdc_writel(panel_info.mmio, ATMEL_LCDC_DMACON, ATMEL_LCDC_DMAEN); lcdc_writel(panel_info.mmio, ATMEL_LCDC_PWRCON, - (1 << ATMEL_LCDC_GUARDT_OFFSET) | ATMEL_LCDC_PWR); + (ATMEL_LCDC_GUARD_TIME << ATMEL_LCDC_GUARDT_OFFSET) | ATMEL_LCDC_PWR); } ulong calc_fbsize(void) |