Merge tag 'fbdev-updates-for-3.5' of git://github.com/schandinat/linux-2.6

Pull fbdev updates from Florian Tobias Schandinat:
 - driver for AUO-K1900 and AUO-K1901 epaper controller
 - large updates for OMAP (e.g. decouple HDMI audio and video)
 - some updates for Exynos and SH Mobile
 - various other small fixes and cleanups

* tag 'fbdev-updates-for-3.5' of git://github.com/schandinat/linux-2.6: (130 commits)
  video: bfin_adv7393fb: Fix cleanup code
  video: exynos_dp: reduce delay time when configuring video setting
  video: exynos_dp: move sw reset prioir to enabling sw defined function
  video: exynos_dp: use devm_ functions
  fb: handle NULL pointers in framebuffer release
  OMAPDSS: HDMI: OMAP4: Update IRQ flags for the HPD IRQ request
  OMAPDSS: Apply VENC timings even if panel is disabled
  OMAPDSS: VENC/DISPC: Delay dividing Y resolution for managers connected to VENC
  OMAPDSS: DISPC: Support rotation through TILER
  OMAPDSS: VRFB: remove compiler warnings when CONFIG_BUG=n
  OMAPFB: remove compiler warnings when CONFIG_BUG=n
  OMAPDSS: remove compiler warnings when CONFIG_BUG=n
  OMAPDSS: DISPC: fix usage of dispc_ovl_set_accu_uv
  OMAPDSS: use DSI_FIFO_BUG workaround only for manual update displays
  OMAPDSS: DSI: Support command mode interleaving during video mode blanking periods
  OMAPDSS: DISPC: Update Accumulator configuration for chroma plane
  drivers/video: fsl-diu-fb: don't initialize the THRESHOLDS registers
  video: exynos mipi dsi: support reverse panel type
  video: exynos mipi dsi: Properly interpret the interrupt source flags
  video: exynos mipi dsi: Avoid races in probe()
  ...

21 files changed, 527 insertions, 305 deletions

diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index 972983e392bc..656f8fc9addd 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -237,25 +237,29 @@ static struct exynos_drm_fimd_pdata drm_fimd_pdata = {
 #else
 /* 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 a7f7fd567dde..f5572be9d7bf 100644
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -604,24 +604,28 @@ static struct exynos_drm_fimd_pdata drm_fimd_pdata = {
 };
 #else
 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,
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c
index 70df1a0c2118..262e9e446a96 100644
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@ -178,22 +178,26 @@ static struct exynos_drm_fimd_pdata drm_fimd_pdata = {
 };
 #else
 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 083b44de9c10..cd92fa86ba41 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -843,25 +843,29 @@ static struct exynos_drm_fimd_pdata drm_fimd_pdata = {
 #else
 /* 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
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index db5a88a36c63..54d49ddb9b81 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -180,16 +180,133 @@ static void omap_dsi_disable_pads(int dsi_id, unsigned lane_mask)
                 omap4_dsi_mux_pads(dsi_id, 0);
 }
 
+static int omap_dss_set_min_bus_tput(struct device *dev, unsigned long tput)
+{
+        return omap_pm_set_min_bus_tput(dev, OCP_INITIATOR_AGENT, tput);
+}
+
+static struct platform_device *create_dss_pdev(const char *pdev_name,
+                int pdev_id, const char *oh_name, void *pdata, int pdata_len,
+                struct platform_device *parent)
+{
+        struct platform_device *pdev;
+        struct omap_device *od;
+        struct omap_hwmod *ohs[1];
+        struct omap_hwmod *oh;
+        int r;
+
+        oh = omap_hwmod_lookup(oh_name);
+        if (!oh) {
+                pr_err("Could not look up %s\n", oh_name);
+                r = -ENODEV;
+                goto err;
+        }
+
+        pdev = platform_device_alloc(pdev_name, pdev_id);
+        if (!pdev) {
+                pr_err("Could not create pdev for %s\n", pdev_name);
+                r = -ENOMEM;
+                goto err;
+        }
+
+        if (parent != NULL)
+                pdev->dev.parent = &parent->dev;
+
+        if (pdev->id != -1)
+                dev_set_name(&pdev->dev, "%s.%d", pdev->name, pdev->id);
+        else
+                dev_set_name(&pdev->dev, "%s", pdev->name);
+
+        ohs[0] = oh;
+        od = omap_device_alloc(pdev, ohs, 1, NULL, 0);
+        if (!od) {
+                pr_err("Could not alloc omap_device for %s\n", pdev_name);
+                r = -ENOMEM;
+                goto err;
+        }
+
+        r = platform_device_add_data(pdev, pdata, pdata_len);
+        if (r) {
+                pr_err("Could not set pdata for %s\n", pdev_name);
+                goto err;
+        }
+
+        r = omap_device_register(pdev);
+        if (r) {
+                pr_err("Could not register omap_device for %s\n", pdev_name);
+                goto err;
+        }
+
+        return pdev;
+
+err:
+        return ERR_PTR(r);
+}
+
+static struct platform_device *create_simple_dss_pdev(const char *pdev_name,
+                int pdev_id, void *pdata, int pdata_len,
+                struct platform_device *parent)
+{
+        struct platform_device *pdev;
+        int r;
+
+        pdev = platform_device_alloc(pdev_name, pdev_id);
+        if (!pdev) {
+                pr_err("Could not create pdev for %s\n", pdev_name);
+                r = -ENOMEM;
+                goto err;
+        }
+
+        if (parent != NULL)
+                pdev->dev.parent = &parent->dev;
+
+        if (pdev->id != -1)
+                dev_set_name(&pdev->dev, "%s.%d", pdev->name, pdev->id);
+        else
+                dev_set_name(&pdev->dev, "%s", pdev->name);
+
+        r = platform_device_add_data(pdev, pdata, pdata_len);
+        if (r) {
+                pr_err("Could not set pdata for %s\n", pdev_name);
+                goto err;
+        }
+
+        r = omap_device_register(pdev);
+        if (r) {
+                pr_err("Could not register omap_device for %s\n", pdev_name);
+                goto err;
+        }
+
+        return pdev;
+
+err:
+        return ERR_PTR(r);
+}
+
 int __init omap_display_init(struct omap_dss_board_info *board_data)
 {
         int r = 0;
-        struct omap_hwmod *oh;
         struct platform_device *pdev;
         int i, oh_count;
-        struct omap_display_platform_data pdata;
         const struct omap_dss_hwmod_data *curr_dss_hwmod;
+        struct platform_device *dss_pdev;
+
+        /* create omapdss device */
+
+        board_data->dsi_enable_pads = omap_dsi_enable_pads;
+        board_data->dsi_disable_pads = omap_dsi_disable_pads;
+        board_data->get_context_loss_count = omap_pm_get_dev_context_loss_count;
+        board_data->set_min_bus_tput = omap_dss_set_min_bus_tput;
+
+        omap_display_device.dev.platform_data = board_data;
+
+        r = platform_device_register(&omap_display_device);
+        if (r < 0) {
+                pr_err("Unable to register omapdss device\n");
+                return r;
+        }
 
-        memset(&pdata, 0, sizeof(pdata));
+        /* create devices for dss hwmods */
 
         if (cpu_is_omap24xx()) {
                 curr_dss_hwmod = omap2_dss_hwmod_data;
@@ -202,39 +319,58 @@ int __init omap_display_init(struct omap_dss_board_info *board_data)
                 oh_count = ARRAY_SIZE(omap4_dss_hwmod_data);
         }
 
-        if (board_data->dsi_enable_pads == NULL)
-                board_data->dsi_enable_pads = omap_dsi_enable_pads;
-        if (board_data->dsi_disable_pads == NULL)
-                board_data->dsi_disable_pads = omap_dsi_disable_pads;
-
-        pdata.board_data = board_data;
-        pdata.board_data->get_context_loss_count =
-                omap_pm_get_dev_context_loss_count;
-
-        for (i = 0; i < oh_count; i++) {
-                oh = omap_hwmod_lookup(curr_dss_hwmod[i].oh_name);
-                if (!oh) {
-                        pr_err("Could not look up %s\n",
-                                curr_dss_hwmod[i].oh_name);
-                        return -ENODEV;
+        /*
+         * First create the pdev for dss_core, which is used as a parent device
+         * by the other dss pdevs. Note: dss_core has to be the first item in
+         * the hwmod list.
+         */
+        dss_pdev = create_dss_pdev(curr_dss_hwmod[0].dev_name,
+                        curr_dss_hwmod[0].id,
+                        curr_dss_hwmod[0].oh_name,
+                        board_data, sizeof(*board_data),
+                        NULL);
+
+        if (IS_ERR(dss_pdev)) {
+                pr_err("Could not build omap_device for %s\n",
+                                curr_dss_hwmod[0].oh_name);
+
+                return PTR_ERR(dss_pdev);
+        }
+
+        for (i = 1; i < oh_count; i++) {
+                pdev = create_dss_pdev(curr_dss_hwmod[i].dev_name,
+                                curr_dss_hwmod[i].id,
+                                curr_dss_hwmod[i].oh_name,
+                                board_data, sizeof(*board_data),
+                                dss_pdev);
+
+                if (IS_ERR(pdev)) {
+                        pr_err("Could not build omap_device for %s\n",
+                                        curr_dss_hwmod[i].oh_name);
+
+                        return PTR_ERR(pdev);
                 }
+        }
 
-                pdev = omap_device_build(curr_dss_hwmod[i].dev_name,
-                                curr_dss_hwmod[i].id, oh, &pdata,
-                                sizeof(struct omap_display_platform_data),
-                                NULL, 0, 0);
+        /* Create devices for DPI and SDI */
 
-                if (WARN((IS_ERR(pdev)), "Could not build omap_device for %s\n",
-                                curr_dss_hwmod[i].oh_name))
-                        return -ENODEV;
+        pdev = create_simple_dss_pdev("omapdss_dpi", -1,
+                        board_data, sizeof(*board_data), dss_pdev);
+        if (IS_ERR(pdev)) {
+                pr_err("Could not build platform_device for omapdss_dpi\n");
+                return PTR_ERR(pdev);
         }
-        omap_display_device.dev.platform_data = board_data;
 
-        r = platform_device_register(&omap_display_device);
-        if (r < 0)
-                printk(KERN_ERR "Unable to register OMAP-Display device\n");
+        if (cpu_is_omap34xx()) {
+                pdev = create_simple_dss_pdev("omapdss_sdi", -1,
+                                board_data, sizeof(*board_data), dss_pdev);
+                if (IS_ERR(pdev)) {
+                        pr_err("Could not build platform_device for omapdss_sdi\n");
+                        return PTR_ERR(pdev);
+                }
+        }
 
-        return r;
+        return 0;
 }
 
 static void dispc_disable_outputs(void)
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2416.c b/arch/arm/mach-s3c24xx/mach-smdk2416.c
index 30a44f806e01..c3100a044fbe 100644
--- a/arch/arm/mach-s3c24xx/mach-smdk2416.c
+++ b/arch/arm/mach-s3c24xx/mach-smdk2416.c
@@ -148,23 +148,25 @@ static struct s3c24xx_hsudc_platdata smdk2416_hsudc_platdata = {
 
 static struct s3c_fb_pd_win smdk2416_fb_win[] = {
         [0] = {
-                /* think this is the same as the smdk6410 */
-                .win_mode       = {
-                        .pixclock       = 41094,
-                        .left_margin    = 8,
-                        .right_margin   = 13,
-                        .upper_margin   = 7,
-                        .lower_margin   = 5,
-                        .hsync_len      = 3,
-                        .vsync_len      = 1,
-                        .xres           = 800,
-                        .yres           = 480,
-                },
                 .default_bpp    = 16,
                 .max_bpp        = 32,
+                .xres           = 800,
+                .yres           = 480,
         },
 };
 
+static struct fb_videomode smdk2416_lcd_timing = {
+        .pixclock       = 41094,
+        .left_margin    = 8,
+        .right_margin   = 13,
+        .upper_margin   = 7,
+        .lower_margin   = 5,
+        .hsync_len      = 3,
+        .vsync_len      = 1,
+        .xres           = 800,
+        .yres           = 480,
+};
+
 static void s3c2416_fb_gpio_setup_24bpp(void)
 {
         unsigned int gpio;
@@ -187,6 +189,7 @@ static void s3c2416_fb_gpio_setup_24bpp(void)
 
 static struct s3c_fb_platdata smdk2416_fb_platdata = {
         .win[0]         = &smdk2416_fb_win[0],
+        .vtiming        = &smdk2416_lcd_timing,
         .setup_gpio     = s3c2416_fb_gpio_setup_24bpp,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c
index 314df0518afd..ffa29ddfdfce 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 6b20a71d7dbf..d0c352d861f8 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 1bf6b9da20fc..689088162f77 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 f8ea61ea3b33..5539a255a704 100644
--- a/arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/arch/arm/mach-s3c64xx/mach-mini6410.c
@@ -140,41 +140,59 @@ static struct s3c2410_platform_nand mini6410_nand_info = {
         .sets           = mini6410_nand_sets,
 };
 
-static struct s3c_fb_pd_win mini6410_fb_win[] = {
+static struct s3c_fb_pd_win mini6410_lcd_type0_fb_win = {
+        .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 = {
+        .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 = {
         {
-                .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        = &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,
         }, {
-                .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        = &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,
         },
-};
-
-static struct s3c_fb_platdata mini6410_lcd_pdata __initdata = {
-        .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
-        .win[0]         = &mini6410_fb_win[0],
-        .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
-        .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
+        { },
 };
 
 static void mini6410_lcd_power_set(struct plat_lcd_data *pd,
@@ -272,7 +290,7 @@ static void mini6410_parse_features(
                                         "screen type already set\n", f);
                         } else {
                                 int li = f - '0';
-                                if (li >= ARRAY_SIZE(mini6410_fb_win))
+                                if (li >= ARRAY_SIZE(mini6410_lcd_pdata))
                                         printk(KERN_INFO "MINI6410: '%c' out "
                                                 "of range LCD mode\n", f);
                                 else {
@@ -296,14 +314,12 @@ static void __init mini6410_machine_init(void)
         /* Parse the feature string */
         mini6410_parse_features(&features, mini6410_features_str);
 
-        mini6410_lcd_pdata.win[0] = &mini6410_fb_win[features.lcd_index];
-
         printk(KERN_INFO "MINI6410: selected LCD display is %dx%d\n",
-                mini6410_lcd_pdata.win[0]->win_mode.xres,
-                mini6410_lcd_pdata.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);
+        s3c_fb_set_platdata(&mini6410_lcd_pdata[features.lcd_index]);
         s3c24xx_ts_set_platdata(NULL);
 
         /* configure nCS1 width to 16 bits */
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);
 
diff --git a/arch/arm/mach-s3c64xx/mach-smartq5.c b/arch/arm/mach-s3c64xx/mach-smartq5.c
index c5021d0335c6..d6266d8b43c9 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 aa9072a4cbef..0957d2a980e1 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 d44319b09412..df3103d450e2 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,
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c
index a40e325d62c8..92fefad505cc 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6440.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c
@@ -103,22 +103,26 @@ static struct s3c2410_uartcfg smdk6440_uartcfgs[] __initdata = {
 
 /* Frame Buffer */
 static struct s3c_fb_pd_win smdk6440_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    = 24,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct fb_videomode smdk6440_lcd_timing = {
+        .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 smdk6440_lcd_pdata __initdata = {
         .win[0]         = &smdk6440_fb_win0,
+        .vtiming        = &smdk6440_lcd_timing,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
         .setup_gpio     = s5p64x0_fb_gpio_setup_24bpp,
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c
index efb69e2f2afe..e2335ecf6eae 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6450.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c
@@ -121,22 +121,26 @@ static struct s3c2410_uartcfg smdk6450_uartcfgs[] __initdata = {
 
 /* Frame Buffer */
 static struct s3c_fb_pd_win smdk6450_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    = 24,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct fb_videomode smdk6450_lcd_timing = {
+        .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 smdk6450_lcd_pdata __initdata = {
         .win[0]         = &smdk6450_fb_win0,
+        .vtiming        = &smdk6450_lcd_timing,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
         .setup_gpio     = s5p64x0_fb_gpio_setup_24bpp,
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c
index 674d22992f3c..0c3ae38d27ca 100644
--- a/arch/arm/mach-s5pc100/mach-smdkc100.c
+++ b/arch/arm/mach-s5pc100/mach-smdkc100.c
@@ -136,24 +136,27 @@ static struct platform_device smdkc100_lcd_powerdev = {
 
 /* Frame Buffer */
 static struct s3c_fb_pd_win smdkc100_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,
-                .refresh        = 80,
-        },
         .max_bpp        = 32,
         .default_bpp    = 16,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct fb_videomode smdkc100_lcd_timing = {
+        .left_margin    = 8,
+        .right_margin   = 13,
+        .upper_margin   = 7,
+        .lower_margin   = 5,
+        .hsync_len      = 3,
+        .vsync_len      = 1,
+        .xres           = 800,
+        .yres           = 480,
+        .refresh        = 80,
 };
 
 static struct s3c_fb_platdata smdkc100_lcd_pdata __initdata = {
         .win[0]         = &smdkc100_fb_win0,
+        .vtiming        = &smdkc100_lcd_timing,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
         .setup_gpio     = s5pc100_fb_gpio_setup_24bpp,
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
index 48d018f2332b..af528f9e97f9 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 f20a97c8e411..bf5087c2b7fe 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -107,25 +107,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 fa1b61209fd9..0d7ddec88eb7 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -178,22 +178,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,
diff --git a/arch/arm/plat-samsung/include/plat/fb.h b/arch/arm/plat-samsung/include/plat/fb.h
index 0fedf47fa502..536002ff2ab8 100644
--- a/arch/arm/plat-samsung/include/plat/fb.h
+++ b/arch/arm/plat-samsung/include/plat/fb.h
@@ -24,15 +24,16 @@
 
 /**
  * struct s3c_fb_pd_win - per window setup data
- * @win_mode: The display parameters to initialise (not for window 0)
+ * @xres     : The window X size.
+ * @yres     : The window Y size.
  * @virtual_x: The virtual X size.
  * @virtual_y: The virtual Y size.
  */
 struct s3c_fb_pd_win {
-        struct fb_videomode     win_mode;
-
         unsigned short          default_bpp;
         unsigned short          max_bpp;
+        unsigned short          xres;
+        unsigned short          yres;
         unsigned short          virtual_x;
         unsigned short          virtual_y;
 };
@@ -45,6 +46,7 @@ struct s3c_fb_pd_win {
  * @default_win: default window layer number to be used for UI layer.
  * @vidcon0: The base vidcon0 values to control the panel data format.
  * @vidcon1: The base vidcon1 values to control the panel data output.
+ * @vtiming: Video timing when connected to a RGB type panel.
  * @win: The setup data for each hardware window, or NULL for unused.
  * @display_mode: The LCD output display mode.
  *
@@ -58,8 +60,7 @@ struct s3c_fb_platdata {
         void    (*setup_gpio)(void);
 
         struct s3c_fb_pd_win    *win[S3C_FB_MAX_WIN];
-
-        u32                      default_win;
+        struct fb_videomode     *vtiming;
 
         u32                      vidcon0;
         u32                      vidcon1;