summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-10-28 08:37:19 +0100
committerWolfgang Denk <wd@denx.de>2008-10-28 08:37:19 +0100
commitd35c451d6cff3e77e40fbdfc7a2933cdcb86ae4b (patch)
treeb9cabe836db20373a8e645b30be6c0aa6eb7896a /drivers
parenta369f4a492fa2805d87775d27380f0eeaca35aa6 (diff)
parent6b59e03e0237a40a2305ea385defdfd92000978b (diff)
downloadblackbird-obmc-uboot-d35c451d6cff3e77e40fbdfc7a2933cdcb86ae4b.tar.gz
blackbird-obmc-uboot-d35c451d6cff3e77e40fbdfc7a2933cdcb86ae4b.zip
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/atmel_lcdfb.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index b332a825e3..3a51cc7c56 100644
--- 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>
@@ -108,10 +107,7 @@ void lcd_ctrl_init(void *lcdbase)
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);
OpenPOWER on IntegriCloud