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>

3 files changed, 45 insertions, 41 deletions

diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
index a9ea64e0da0d..7b91bbf887fe 100644
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -96,38 +96,34 @@ static struct s3c2410_uartcfg aquila_uartcfgs[] __initdata = {
 
 /* Frame Buffer */
 static struct s3c_fb_pd_win aquila_fb_win0 = {
-        .win_mode = {
-                .left_margin = 16,
-                .right_margin = 16,
-                .upper_margin = 3,
-                .lower_margin = 28,
-                .hsync_len = 2,
-                .vsync_len = 2,
-                .xres = 480,
-                .yres = 800,
-        },
         .max_bpp = 32,
         .default_bpp = 16,
+        .xres = 480,
+        .yres = 800,
 };
 
 static struct s3c_fb_pd_win aquila_fb_win1 = {
-        .win_mode = {
-                .left_margin = 16,
-                .right_margin = 16,
-                .upper_margin = 3,
-                .lower_margin = 28,
-                .hsync_len = 2,
-                .vsync_len = 2,
-                .xres = 480,
-                .yres = 800,
-        },
         .max_bpp = 32,
         .default_bpp = 16,
+        .xres = 480,
+        .yres = 800,
+};
+
+static struct fb_videomode aquila_lcd_timing = {
+        .left_margin = 16,
+        .right_margin = 16,
+        .upper_margin = 3,
+        .lower_margin = 28,
+        .hsync_len = 2,
+        .vsync_len = 2,
+        .xres = 480,
+        .yres = 800,
 };
 
 static struct s3c_fb_platdata aquila_lcd_pdata __initdata = {
         .win[0]         = &aquila_fb_win0,
         .win[1]         = &aquila_fb_win1,
+        .vtiming        = &aquila_lcd_timing,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC |
                           VIDCON1_INV_VCLK | VIDCON1_INV_VDEN,
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index 2cf5ed75f390..07a840de9a38 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -105,25 +105,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
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c
index 91d4ad8bcc73..5e0c9559d4b3 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -189,22 +189,26 @@ static struct platform_device smdkv210_lcd_lte480wv = {
 };
 
 static struct s3c_fb_pd_win smdkv210_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,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct fb_videomode smdkv210_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 smdkv210_lcd0_pdata __initdata = {
         .win[0]         = &smdkv210_fb_win0,
+        .vtiming        = &smdkv210_lcd_timing,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
         .setup_gpio     = s5pv210_fb_gpio_setup_24bpp,