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>

8 files changed, 148 insertions, 109 deletions

diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c
index b86f2779e4e6..58fd0e3ad2b4 100644
--- a/arch/arm/mach-s3c64xx/mach-anw6410.c
+++ b/arch/arm/mach-s3c64xx/mach-anw6410.c
@@ -134,24 +134,27 @@ static struct platform_device anw6410_lcd_powerdev = {
 };
 
 static struct s3c_fb_pd_win anw6410_fb_win0 = {
-        /* this is to ensure we use win0 */
-        .win_mode       = {
-                .left_margin    = 8,
-                .right_margin   = 13,
-                .upper_margin   = 7,
-                .lower_margin   = 5,
-                .hsync_len      = 3,
-                .vsync_len      = 1,
-                .xres           = 800,
-                .yres           = 480,
-        },
         .max_bpp        = 32,
         .default_bpp    = 16,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct fb_videomode anw6410_lcd_timing = {
+        .left_margin    = 8,
+        .right_margin   = 13,
+        .upper_margin   = 7,
+        .lower_margin   = 5,
+        .hsync_len      = 3,
+        .vsync_len      = 1,
+        .xres           = 800,
+        .yres           = 480,
 };
 
 /* 405566 clocks per frame => 60Hz refresh requires 24333960Hz clock */
 static struct s3c_fb_platdata anw6410_lcd_pdata __initdata = {
         .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+        .vtiming        = &anw6410_lcd_timing,
         .win[0]         = &anw6410_fb_win0,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index e20bf5835365..c1ef57edd42d 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -151,26 +151,29 @@ static struct platform_device crag6410_lcd_powerdev = {
 
 /* 640x480 URT */
 static struct s3c_fb_pd_win crag6410_fb_win0 = {
-        /* this is to ensure we use win0 */
-        .win_mode       = {
-                .left_margin    = 150,
-                .right_margin   = 80,
-                .upper_margin   = 40,
-                .lower_margin   = 5,
-                .hsync_len      = 40,
-                .vsync_len      = 5,
-                .xres           = 640,
-                .yres           = 480,
-        },
         .max_bpp        = 32,
         .default_bpp    = 16,
+        .xres           = 640,
+        .yres           = 480,
         .virtual_y      = 480 * 2,
         .virtual_x      = 640,
 };
 
+static struct fb_videomode crag6410_lcd_timing = {
+        .left_margin    = 150,
+        .right_margin   = 80,
+        .upper_margin   = 40,
+        .lower_margin   = 5,
+        .hsync_len      = 40,
+        .vsync_len      = 5,
+        .xres           = 640,
+        .yres           = 480,
+};
+
 /* 405566 clocks per frame => 60Hz refresh requires 24333960Hz clock */
 static struct s3c_fb_platdata crag6410_lcd_pdata __initdata = {
         .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+        .vtiming        = &crag6410_lcd_timing,
         .win[0]         = &crag6410_fb_win0,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c
index 521e07b8501b..4e9b1acefb07 100644
--- a/arch/arm/mach-s3c64xx/mach-hmt.c
+++ b/arch/arm/mach-s3c64xx/mach-hmt.c
@@ -129,23 +129,27 @@ static struct platform_device hmt_backlight_device = {
 };
 
 static struct s3c_fb_pd_win hmt_fb_win0 = {
-        .win_mode       = {
-                .left_margin    = 8,
-                .right_margin   = 13,
-                .upper_margin   = 7,
-                .lower_margin   = 5,
-                .hsync_len      = 3,
-                .vsync_len      = 1,
-                .xres           = 800,
-                .yres           = 480,
-        },
         .max_bpp        = 32,
         .default_bpp    = 16,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct fb_videomode hmt_lcd_timing = {
+        .left_margin    = 8,
+        .right_margin   = 13,
+        .upper_margin   = 7,
+        .lower_margin   = 5,
+        .hsync_len      = 3,
+        .vsync_len      = 1,
+        .xres           = 800,
+        .yres           = 480,
 };
 
 /* 405566 clocks per frame => 60Hz refresh requires 24333960Hz clock */
 static struct s3c_fb_platdata hmt_lcd_pdata __initdata = {
         .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+        .vtiming        = &hmt_lcd_timing,
         .win[0]         = &hmt_fb_win0,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c
index 34f51950b46e..2f425d5d8af5 100644
--- a/arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/arch/arm/mach-s3c64xx/mach-mini6410.c
@@ -152,43 +152,53 @@ static struct s3c2410_platform_nand mini6410_nand_info = {
 };
 
 static struct s3c_fb_pd_win mini6410_lcd_type0_fb_win = {
-        .win_mode       = {     /* 4.3" 480x272 */
-                .left_margin    = 3,
-                .right_margin   = 2,
-                .upper_margin   = 1,
-                .lower_margin   = 1,
-                .hsync_len      = 40,
-                .vsync_len      = 1,
-                .xres           = 480,
-                .yres           = 272,
-        },
         .max_bpp        = 32,
         .default_bpp    = 16,
+        .xres           = 480,
+        .yres           = 272,
+};
+
+static struct fb_videomode mini6410_lcd_type0_timing = {
+        /* 4.3" 480x272 */
+        .left_margin    = 3,
+        .right_margin   = 2,
+        .upper_margin   = 1,
+        .lower_margin   = 1,
+        .hsync_len      = 40,
+        .vsync_len      = 1,
+        .xres           = 480,
+        .yres           = 272,
 };
 
 static struct s3c_fb_pd_win mini6410_lcd_type1_fb_win = {
-        .win_mode       = {     /* 7.0" 800x480 */
-                .left_margin    = 8,
-                .right_margin   = 13,
-                .upper_margin   = 7,
-                .lower_margin   = 5,
-                .hsync_len      = 3,
-                .vsync_len      = 1,
-                .xres           = 800,
-                .yres           = 480,
-        },
         .max_bpp        = 32,
         .default_bpp    = 16,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct fb_videomode mini6410_lcd_type1_timing = {
+        /* 7.0" 800x480 */
+        .left_margin    = 8,
+        .right_margin   = 13,
+        .upper_margin   = 7,
+        .lower_margin   = 5,
+        .hsync_len      = 3,
+        .vsync_len      = 1,
+        .xres           = 800,
+        .yres           = 480,
 };
 
 static struct s3c_fb_platdata mini6410_lcd_pdata[] __initdata = {
         {
                 .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+                .vtiming        = &mini6410_lcd_type0_timing,
                 .win[0]         = &mini6410_lcd_type0_fb_win,
                 .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
                 .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
         }, {
                 .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+                .vtiming        = &mini6410_lcd_type1_timing,
                 .win[0]         = &mini6410_lcd_type1_fb_win,
                 .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
                 .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
@@ -316,8 +326,8 @@ static void __init mini6410_machine_init(void)
         mini6410_parse_features(&features, mini6410_features_str);
 
         printk(KERN_INFO "MINI6410: selected LCD display is %dx%d\n",
-                mini6410_lcd_pdata[features.lcd_index].win[0]->win_mode.xres,
-                mini6410_lcd_pdata[features.lcd_index].win[0]->win_mode.yres);
+                mini6410_lcd_pdata[features.lcd_index].win[0]->xres,
+                mini6410_lcd_pdata[features.lcd_index].win[0]->yres);
 
         s3c_nand_set_platdata(&mini6410_nand_info);
         s3c_fb_set_platdata(&mini6410_lcd_pdata[features.lcd_index]);
diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c
index 21f91e5b093d..0fbd32c74ee5 100644
--- a/arch/arm/mach-s3c64xx/mach-real6410.c
+++ b/arch/arm/mach-s3c64xx/mach-real6410.c
@@ -118,43 +118,51 @@ static struct platform_device real6410_device_eth = {
 };
 
 static struct s3c_fb_pd_win real6410_lcd_type0_fb_win = {
-        .win_mode       = {     /* 4.3" 480x272 */
-                .left_margin    = 3,
-                .right_margin   = 2,
-                .upper_margin   = 1,
-                .lower_margin   = 1,
-                .hsync_len      = 40,
-                .vsync_len      = 1,
-                .xres           = 480,
-                .yres           = 272,
-        },
         .max_bpp        = 32,
         .default_bpp    = 16,
+        .xres           = 480,
+        .yres           = 272,
+};
+
+static struct fb_videomode real6410_lcd_type0_timing = {
+        /* 4.3" 480x272 */
+        .left_margin    = 3,
+        .right_margin   = 2,
+        .upper_margin   = 1,
+        .lower_margin   = 1,
+        .hsync_len      = 40,
+        .vsync_len      = 1,
 };
 
 static struct s3c_fb_pd_win real6410_lcd_type1_fb_win = {
-        .win_mode       = {     /* 7.0" 800x480 */
-                .left_margin    = 8,
-                .right_margin   = 13,
-                .upper_margin   = 7,
-                .lower_margin   = 5,
-                .hsync_len      = 3,
-                .vsync_len      = 1,
-                .xres           = 800,
-                .yres           = 480,
-        },
         .max_bpp        = 32,
         .default_bpp    = 16,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct fb_videomode real6410_lcd_type1_timing = {
+        /* 7.0" 800x480 */
+        .left_margin    = 8,
+        .right_margin   = 13,
+        .upper_margin   = 7,
+        .lower_margin   = 5,
+        .hsync_len      = 3,
+        .vsync_len      = 1,
+        .xres           = 800,
+        .yres           = 480,
 };
 
 static struct s3c_fb_platdata real6410_lcd_pdata[] __initdata = {
         {
                 .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+                .vtiming        = &real6410_lcd_type0_timing,
                 .win[0]         = &real6410_lcd_type0_fb_win,
                 .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
                 .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
         }, {
                 .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+                .vtiming        = &real6410_lcd_type1_timing,
                 .win[0]         = &real6410_lcd_type1_fb_win,
                 .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
                 .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
@@ -297,8 +305,8 @@ static void __init real6410_machine_init(void)
         real6410_parse_features(&features, real6410_features_str);
 
         printk(KERN_INFO "REAL6410: selected LCD display is %dx%d\n",
-                real6410_lcd_pdata[features.lcd_index].win[0]->win_mode.xres,
-                real6410_lcd_pdata[features.lcd_index].win[0]->win_mode.yres);
+                real6410_lcd_pdata[features.lcd_index].win[0]->xres,
+                real6410_lcd_pdata[features.lcd_index].win[0]->yres);
 
         s3c_fb_set_platdata(&real6410_lcd_pdata[features.lcd_index]);
         s3c_nand_set_platdata(&real6410_nand_info);
diff --git a/arch/arm/mach-s3c64xx/mach-smartq5.c b/arch/arm/mach-s3c64xx/mach-smartq5.c
index 3f42431d4dda..03a2f88aabe1 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq5.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq5.c
@@ -108,23 +108,27 @@ static struct platform_device smartq5_buttons_device  = {
 };
 
 static struct s3c_fb_pd_win smartq5_fb_win0 = {
-        .win_mode       = {
-                .left_margin    = 216,
-                .right_margin   = 40,
-                .upper_margin   = 35,
-                .lower_margin   = 10,
-                .hsync_len      = 1,
-                .vsync_len      = 1,
-                .xres           = 800,
-                .yres           = 480,
-                .refresh        = 80,
-        },
         .max_bpp        = 32,
         .default_bpp    = 16,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct fb_videomode smartq5_lcd_timing = {
+        .left_margin    = 216,
+        .right_margin   = 40,
+        .upper_margin   = 35,
+        .lower_margin   = 10,
+        .hsync_len      = 1,
+        .vsync_len      = 1,
+        .xres           = 800,
+        .yres           = 480,
+        .refresh        = 80,
 };
 
 static struct s3c_fb_platdata smartq5_lcd_pdata __initdata = {
         .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+        .vtiming        = &smartq5_lcd_timing,
         .win[0]         = &smartq5_fb_win0,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC |
diff --git a/arch/arm/mach-s3c64xx/mach-smartq7.c b/arch/arm/mach-s3c64xx/mach-smartq7.c
index e5c09b6db967..4e3b0385e868 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq7.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq7.c
@@ -124,23 +124,27 @@ static struct platform_device smartq7_buttons_device  = {
 };
 
 static struct s3c_fb_pd_win smartq7_fb_win0 = {
-        .win_mode       = {
-                .left_margin    = 3,
-                .right_margin   = 5,
-                .upper_margin   = 1,
-                .lower_margin   = 20,
-                .hsync_len      = 10,
-                .vsync_len      = 3,
-                .xres           = 800,
-                .yres           = 480,
-                .refresh        = 80,
-        },
         .max_bpp        = 32,
         .default_bpp    = 16,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct fb_videomode smartq7_lcd_timing = {
+        .left_margin    = 3,
+        .right_margin   = 5,
+        .upper_margin   = 1,
+        .lower_margin   = 20,
+        .hsync_len      = 10,
+        .vsync_len      = 3,
+        .xres           = 800,
+        .yres           = 480,
+        .refresh        = 80,
 };
 
 static struct s3c_fb_platdata smartq7_lcd_pdata __initdata = {
         .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+        .vtiming        = &smartq7_lcd_timing,
         .win[0]         = &smartq7_fb_win0,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC |
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index d55bc96d9582..3cfc90f7ed31 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -146,26 +146,29 @@ static struct platform_device smdk6410_lcd_powerdev = {
 };
 
 static struct s3c_fb_pd_win smdk6410_fb_win0 = {
-        /* this is to ensure we use win0 */
-        .win_mode       = {
-                .left_margin    = 8,
-                .right_margin   = 13,
-                .upper_margin   = 7,
-                .lower_margin   = 5,
-                .hsync_len      = 3,
-                .vsync_len      = 1,
-                .xres           = 800,
-                .yres           = 480,
-        },
         .max_bpp        = 32,
         .default_bpp    = 16,
+        .xres           = 800,
+        .yres           = 480,
         .virtual_y      = 480 * 2,
         .virtual_x      = 800,
 };
 
+static struct fb_videomode smdk6410_lcd_timing = {
+        .left_margin    = 8,
+        .right_margin   = 13,
+        .upper_margin   = 7,
+        .lower_margin   = 5,
+        .hsync_len      = 3,
+        .vsync_len      = 1,
+        .xres           = 800,
+        .yres           = 480,
+};
+
 /* 405566 clocks per frame => 60Hz refresh requires 24333960Hz clock */
 static struct s3c_fb_platdata smdk6410_lcd_pdata __initdata = {
         .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+        .vtiming        = &smdk6410_lcd_timing,
         .win[0]         = &smdk6410_fb_win0,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,