video: mxc: search for display-timings in the mxcfb node, rather than ldb or mxc_lcdif

[karo-tx-linux.git] / drivers / video / mxc / ldb.c

diff --git a/drivers/video/mxc/ldb.c b/drivers/video/mxc/ldb.c
index 6616e53b04e7f6232eebcb7fc0aa8bff648c5d87..6d594425a2040f4f79a5105e2c8886b59ae9c7bd 100644 (file)
--- a/drivers/video/mxc/ldb.c
+++ b/drivers/video/mxc/ldb.c
@@ -291,16 +291,6 @@ static int ldb_get_of_property(struct platform_device *pdev,
                return err;
        }
 
-       if (of_display_timings_exist(np) == 1) {
-               struct videomode vm = { };
-
-               err = of_get_videomode(np, &vm, OF_USE_NATIVE_MODE);
-               if (err == 0) {
-                       fb_videomode_from_videomode(&vm, &ldb_modedb[0]);
-                       ldb_modedb_sz = 1;
-               }
-       }
-
        plat_data->mode = parse_ldb_mode(mode);
        plat_data->ext_ref = ext_ref;
        plat_data->ipu_id = ipu_id;
@@ -826,6 +816,11 @@ static int ldb_disp_init(struct mxc_dispdrv_handle *disp,
        if (is_imx6_ldb(plat_data))
                ldb_ipu_ldb_route(setting->dev_id, setting->disp_id, ldb);
 
+       if (setting->fbmode) {
+               ldb_modedb[0] = *setting->fbmode;
+               ldb_modedb_sz = 1;
+       }
+
        /* must use spec video mode defined by driver */
        ret = fb_find_mode(&setting->fbi->var, setting->fbi, setting->dft_mode_str,
                                ldb_modedb, ldb_modedb_sz, NULL, setting->default_bpp);