diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-08-06 15:12:38 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-08-06 15:12:38 +0200 |
| commit | 7772c13ba07eaabd42499998f3713b23350fc119 (patch) | |
| tree | 32718a8e67114d0ea5dbdb1fdcf58aad09dd52dc /drivers/video | |
| parent | b2b15ebb66f0e7958dff8916077da0aceb2982a8 (diff) | |
| parent | 0eb5717a85b6cba3f67c11fa89bdde38dcd081b5 (diff) | |
| download | u-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.zip u-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.tar.gz u-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.tar.bz2 | |
Merge branch 'favr-32' of git://git.denx.de/u-boot-avr32
Conflicts:
MAINTAINERS
MAKEALL
Makefile
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/atmel_lcdfb.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 27df449..b332a82 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -100,7 +100,11 @@ void lcd_ctrl_init(void *lcdbase) value << ATMEL_LCDC_CLKVAL_OFFSET); /* Initialize control register 2 */ +#ifdef CONFIG_AVR32 + value = ATMEL_LCDC_MEMOR_BIG | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE; +#else value = ATMEL_LCDC_MEMOR_LITTLE | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE; +#endif if (panel_info.vl_tft) value |= ATMEL_LCDC_DISTYPE_TFT; |