ARM: Samsung: Rework platform data of s3c-fb driver

For all the Samsung SoC based boards which have the platform data for
s3c-fb driver, the 'default_win' element in the platform data is removed
and the lcd panel video timing values are moved out of individual window
configuration data.

Acked-by: Jingoo Han <jg1.han@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: JeongHyeon Kim <jhkim@insignal.co.kr>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kwangwoo Lee <kwangwoo.lee@gmail.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Peter Korsgaard <jacmet@sunsite.dk>
Cc: Darius Augulis <augulis.darius@gmail.com>
Cc: Maurus Cuelenaere <mcuelenaere@gmail.com>
Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

4 files changed, 60 insertions, 44 deletions

diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index b3982c867c9c..e1e640e5b52a 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -214,25 +214,29 @@ static struct platform_device nuri_gpio_keys = {
 
 /* Frame Buffer */
 static struct s3c_fb_pd_win nuri_fb_win0 = {
-        .win_mode = {
-                .left_margin    = 64,
-                .right_margin   = 16,
-                .upper_margin   = 64,
-                .lower_margin   = 1,
-                .hsync_len      = 48,
-                .vsync_len      = 3,
-                .xres           = 1024,
-                .yres           = 600,
-                .refresh        = 60,
-        },
         .max_bpp        = 24,
         .default_bpp    = 16,
+        .xres           = 1024,
+        .yres           = 600,
         .virtual_x      = 1024,
         .virtual_y      = 2 * 600,
 };
 
+static struct fb_videomode nuri_lcd_timing = {
+        .left_margin    = 64,
+        .right_margin   = 16,
+        .upper_margin   = 64,
+        .lower_margin   = 1,
+        .hsync_len      = 48,
+        .vsync_len      = 3,
+        .xres           = 1024,
+        .yres           = 600,
+        .refresh        = 60,
+};
+
 static struct s3c_fb_platdata nuri_fb_pdata __initdata = {
         .win[0]         = &nuri_fb_win0,
+        .vtiming        = &nuri_lcd_timing,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB |
                           VIDCON0_CLKSEL_LCD,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c
index 878d4c99142d..0968ebaa01f5 100644
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -584,22 +584,26 @@ static struct platform_device origen_lcd_hv070wsa = {
 };
 
 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,
 };
 
+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,
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c
index 83b91fa777c1..3e482b8c3af8 100644
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@ -161,22 +161,26 @@ static struct platform_device smdkv310_lcd_lte480wv = {
 };
 
 static struct s3c_fb_pd_win smdkv310_fb_win0 = {
-        .win_mode = {
-                .left_margin    = 13,
-                .right_margin   = 8,
-                .upper_margin   = 7,
-                .lower_margin   = 5,
-                .hsync_len      = 3,
-                .vsync_len      = 1,
-                .xres           = 800,
-                .yres           = 480,
-        },
-        .max_bpp                = 32,
-        .default_bpp            = 24,
+        .max_bpp        = 32,
+        .default_bpp    = 24,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct fb_videomode smdkv310_lcd_timing = {
+        .left_margin    = 13,
+        .right_margin   = 8,
+        .upper_margin   = 7,
+        .lower_margin   = 5,
+        .hsync_len      = 3,
+        .vsync_len      = 1,
+        .xres           = 800,
+        .yres           = 480,
 };
 
 static struct s3c_fb_platdata smdkv310_lcd0_pdata __initdata = {
         .win[0]         = &smdkv310_fb_win0,
+        .vtiming        = &smdkv310_lcd_timing,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
         .setup_gpio     = exynos4_fimd0_gpio_setup_24bpp,
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index 6bb9dbdd73fd..879c539923cf 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -812,25 +812,29 @@ static struct i2c_board_info i2c1_devs[] __initdata = {
 
 /* Frame Buffer */
 static struct s3c_fb_pd_win universal_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 universal_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 universal_lcd_pdata __initdata = {
         .win[0]         = &universal_fb_win0,
+        .vtiming        = &universal_lcd_timing,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB |
                           VIDCON0_CLKSEL_LCD,
         .vidcon1        = VIDCON1_INV_VCLK | VIDCON1_INV_VDEN