Merge branch 'omap2-upstream' into devel

[linux-2.6-omap-h63xx.git] / arch / arm / mach-s3c2410 / mach-amlm5900.c

diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c
index 5f51a80fcd5cb3f0634d2a9eeb84ecd511bbb98f..a67a0685664d0ca258b6bbc2b35ed6ea8f6156a2 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-amlm5900.c
+++ b/arch/arm/mach-s3c2410/mach-amlm5900.c
@@ -174,17 +174,16 @@ static struct s3c2410fb_display __initdata amlm5900_lcd_info = {
 
        .type           = S3C2410_LCDCON1_STN4,
 
+       .pixclock       = 680000, /* HCLK = 100MHz */
        .xres           = 160,
        .yres           = 160,
        .bpp            = 4,
        .left_margin    = 1 << (4 + 3),
        .right_margin   = 8 << 3,
+       .hsync_len      = 48,
        .upper_margin   = 0,
        .lower_margin   = 0,
 
-       .lcdcon1        = 0x00008225,
-       .lcdcon2        = 0x0027c000,
-       .lcdcon4        = 0x00000002,
        .lcdcon5        = 0x00000001,
 };