summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-07-07 23:18:03 +0200
committerWolfgang Denk <wd@denx.de>2009-07-07 23:18:03 +0200
commit59869ca72df8bc4e4ffa9dd17cb6673bbe010272 (patch)
treee46016340930b4cc1eb5834117abf107d4be6bc1 /drivers
parent8e5e9b940cdede0debe528cdd7edccccbb3ebf2a (diff)
parent6bbced671719518d0e28ff422623cd7ce396cbda (diff)
downloadu-boot-imx-59869ca72df8bc4e4ffa9dd17cb6673bbe010272.zip
u-boot-imx-59869ca72df8bc4e4ffa9dd17cb6673bbe010272.tar.gz
u-boot-imx-59869ca72df8bc4e4ffa9dd17cb6673bbe010272.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/atmel_lcdfb.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 3a51cc7..db86763 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)