Merge branch 'mimc200' into next

[oweals/u-boot.git] / drivers / video / atmel_lcdfb.c

diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 27df449660c675c8d3d637cf054f228e7004f0f8..3a51cc7c560becba966855d9692d63ed8a82433e 100644 (file)
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -24,7 +24,6 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/clk.h>
 #include <lcd.h>
@@ -100,14 +99,15 @@ 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;
 
-       if (!(panel_info.vl_sync & ATMEL_LCDC_INVLINE_INVERTED))
-               value |= ATMEL_LCDC_INVLINE_INVERTED;
-       if (!(panel_info.vl_sync & ATMEL_LCDC_INVFRAME_INVERTED))
-               value |= ATMEL_LCDC_INVFRAME_INVERTED;
+       value |= panel_info.vl_sync;
        value |= (panel_info.vl_bpix << 5);
        lcdc_writel(panel_info.mmio, ATMEL_LCDC_LCDCON2, value);