Revert "MLK-13996: lcdif: Use DE polarity specified in DTS"
authorCristina Ciocan <cristina-mihaela.ciocan@nxp.com>
Thu, 9 Mar 2017 14:00:47 +0000 (16:00 +0200)
committerNitin Garg <nitin.garg@nxp.com>
Mon, 19 Mar 2018 20:10:53 +0000 (15:10 -0500)
This reverts commit 56412d6a83d8 ("MLK-13996: lcdif: Use DE polarity
specified in DTS").

We need to take the display timings from "disp-dev" if such node exists.
Revert this patch because it tries to find the display-timings in the
display controller node, even though it has been found in the display
device node.

Signed-off-by: Cristina Ciocan <cristina-mihaela.ciocan@nxp.com>
drivers/video/fbdev/mxsfb.c

index bb74d2b..62840ec 100644 (file)
@@ -677,6 +677,7 @@ static void mxsfb_enable_controller(struct fb_info *fb_info)
                                "dispdrv:%s\n", host->dispdrv->drv->name);
                        return;
                }
+               host->sync = fb_info->var.sync;
        }
 
        if (host->reg_lcd) {
@@ -1322,8 +1323,11 @@ static int mxsfb_init_fbinfo_dt(struct mxsfb_info *host)
        }
 
        ret = of_property_read_string(np, "disp-dev", &disp_dev);
-       if (!ret)
+       if (!ret) {
                memcpy(host->disp_dev, disp_dev, strlen(disp_dev));
+               /* Timing is from encoder driver */
+               goto put_display_node;
+       }
 
        timings = of_get_display_timings(display_np);
        if (!timings) {