1 files changed, 52 insertions, 38 deletions

diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c
index b92d8e17d502..326b21604bc3 100644
--- a/arch/arm/mach-s3c64xx/mach-real6410.c
+++ b/arch/arm/mach-s3c64xx/mach-real6410.c
@@ -106,41 +106,57 @@ static struct platform_device real6410_device_eth = {
         },
 };
 
-static struct s3c_fb_pd_win real6410_fb_win[] = {
+static struct s3c_fb_pd_win real6410_lcd_type0_fb_win = {
+        .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 = {
+        .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 = {
         {
-                .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,
+                .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,
         }, {
-                .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,
+                .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,
         },
-};
-
-static struct s3c_fb_platdata real6410_lcd_pdata __initdata = {
-        .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
-        .win[0]         = &real6410_fb_win[0],
-        .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
-        .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
+        { },
 };
 
 static struct mtd_partition real6410_nand_part[] = {
@@ -253,7 +269,7 @@ static void real6410_parse_features(
                                         "screen type already set\n", f);
                         } else {
                                 int li = f - '0';
-                                if (li >= ARRAY_SIZE(real6410_fb_win))
+                                if (li >= ARRAY_SIZE(real6410_lcd_pdata))
                                         printk(KERN_INFO "REAL6410: '%c' out "
                                                 "of range LCD mode\n", f);
                                 else {
@@ -277,13 +293,11 @@ static void __init real6410_machine_init(void)
         /* Parse the feature string */
         real6410_parse_features(&features, real6410_features_str);
 
-        real6410_lcd_pdata.win[0] = &real6410_fb_win[features.lcd_index];
-
         printk(KERN_INFO "REAL6410: selected LCD display is %dx%d\n",
-                real6410_lcd_pdata.win[0]->win_mode.xres,
-                real6410_lcd_pdata.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);
+        s3c_fb_set_platdata(&real6410_lcd_pdata[features.lcd_index]);
         s3c_nand_set_platdata(&real6410_nand_info);
         s3c24xx_ts_set_platdata(NULL);