Merge tag 'fbdev-updates-for-3.5' of git://github.com/schandinat/linux-2.6

[pandora-kernel.git] / arch / arm / mach-s5pv210 / mach-goni.c

diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index f20a97c..bf5087c 100644 (file)
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -107,25 +107,29 @@ static struct s3c2410_uartcfg goni_uartcfgs[] __initdata = {
 
 /* Frame Buffer */
 static struct s3c_fb_pd_win goni_fb_win0 = {
-       .win_mode = {
-               .left_margin    = 16,
-               .right_margin   = 16,
-               .upper_margin   = 2,
-               .lower_margin   = 28,
-               .hsync_len      = 2,
-               .vsync_len      = 1,
-               .xres           = 480,
-               .yres           = 800,
-               .refresh        = 55,
-       },
        .max_bpp        = 32,
        .default_bpp    = 16,
+       .xres           = 480,
+       .yres           = 800,
        .virtual_x      = 480,
        .virtual_y      = 2 * 800,
 };
 
+static struct fb_videomode goni_lcd_timing = {
+       .left_margin    = 16,
+       .right_margin   = 16,
+       .upper_margin   = 2,
+       .lower_margin   = 28,
+       .hsync_len      = 2,
+       .vsync_len      = 1,
+       .xres           = 480,
+       .yres           = 800,
+       .refresh        = 55,
+};
+
 static struct s3c_fb_platdata goni_lcd_pdata __initdata = {
        .win[0]         = &goni_fb_win0,
+       .vtiming        = &goni_lcd_timing,
        .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB |
                          VIDCON0_CLKSEL_LCD,
        .vidcon1        = VIDCON1_INV_VCLK | VIDCON1_INV_VDEN