From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Apr 2012 03:22:37 +0000 (+1000)
Subject: Merge remote-tracking branch 'fbdev/fbdev-next'
X-Git-Tag: next-20120430~37
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f80c91922a032c9a42e7f0564e80c8064d69be29;p=karo-tx-linux.git

Merge remote-tracking branch 'fbdev/fbdev-next'
---

f80c91922a032c9a42e7f0564e80c8064d69be29
diff --cc arch/arm/mach-exynos/mach-origen.c
index 4a8b3ff4b3c7,0968ebaa01f5..2fd5a12dd236
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@@ -582,24 -584,26 +582,28 @@@ static struct platform_device origen_lc
  };
  
  static struct s3c_fb_pd_win origen_fb_win0 = {
- 	.win_mode = {
- 		.left_margin	= 64,
- 		.right_margin	= 16,
- 		.upper_margin	= 64,
- 		.lower_margin	= 16,
- 		.hsync_len	= 48,
- 		.vsync_len	= 3,
- 		.xres		= 1024,
- 		.yres		= 600,
- 	},
+ 	.xres			= 1024,
+ 	.yres			= 600,
  	.max_bpp		= 32,
  	.default_bpp		= 24,
 +	.virtual_x		= 1024,
 +	.virtual_y		= 2 * 600,
  };
  
+ static struct fb_videomode origen_lcd_timing = {
+ 	.left_margin	= 64,
+ 	.right_margin	= 16,
+ 	.upper_margin	= 64,
+ 	.lower_margin	= 16,
+ 	.hsync_len	= 48,
+ 	.vsync_len	= 3,
+ 	.xres		= 1024,
+ 	.yres		= 600,
+ };
+ 
  static struct s3c_fb_platdata origen_lcd_pdata __initdata = {
  	.win[0]		= &origen_fb_win0,
+ 	.vtiming	= &origen_lcd_timing,
  	.vidcon0	= VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
  	.vidcon1	= VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC |
  				VIDCON1_INV_VCLK,