ENGR00302472-10 video: mxsfb: Add mxc disp driver support

This patch adds mxc display driver support for the mxsfb
driver so that it may interactive with encoder drivers.

Signed-off-by: Liu Ying <Ying.Liu@freescale.com>

2 files changed, 75 insertions, 10 deletions

diff --git a/Documentation/devicetree/bindings/fb/mxsfb.txt b/Documentation/devicetree/bindings/fb/mxsfb.txt
index db41376d503e..9fdc0ee9aa24 100644
--- a/Documentation/devicetree/bindings/fb/mxsfb.txt
+++ b/Documentation/devicetree/bindings/fb/mxsfb.txt
@@ -3,21 +3,28 @@
 Required properties:
 - compatible: Should be "fsl,<chip>-lcdif".  Supported chips include
   imx23 and imx28.
-- pinctrl-names: Should be "default"
-- pinctrl-0: pinctrl setting for lcd
-- lcd-supply: lcd power supply, usually via GPIO
 - reg: Address and length of the register set for lcdif
 - interrupts: Should contain lcdif interrupts
 - display : phandle to display node (see below for details)
 
+Optional sub-node:
+These properties are required only when driving LCD panels directly:
+- pinctrl-names: Should be "default"
+- pinctrl-0: pinctrl setting for lcd
+- lcd-supply: lcd power supply, usually via GPIO
+
+This property is required only when driving LDB:
+- disp-dev: Should be "ldb".
+
 * display node
 
 Required properties:
 - bits-per-pixel : <16> for RGB565, <32> for RGB888/666.
 - bus-width : number of data lines.  Could be <8>, <16>, <18> or <24>.
 
-Required sub-node:
+Optional sub-node:
 - display-timings : Refer to binding doc display-timing.txt for details.
+  This property is required only when driving LCD panels directly.
 
 Examples:
 
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index aeacadb996c0..e4d08e3fb4ad 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -57,6 +57,8 @@
 #include <video/of_display_timing.h>
 #include <video/videomode.h>
 
+#include "mxc/mxc_dispdrv.h"
+
 #define REG_SET 4
 #define REG_CLR 8
 
@@ -204,6 +206,8 @@ struct mxsfb_info {
         struct semaphore flip_sem;
         int cur_blank;
         int restore_blank;
+        char disp_dev[32];
+        struct mxc_dispdrv_handle *dispdrv;
 };
 
 #define mxsfb_is_v3(host) (host->devdata->ipversion == 3)
@@ -438,6 +442,15 @@ static void mxsfb_enable_controller(struct fb_info *fb_info)
 
         dev_dbg(&host->pdev->dev, "%s\n", __func__);
 
+        if (host->dispdrv && host->dispdrv->drv->setup) {
+                ret = host->dispdrv->drv->setup(host->dispdrv, fb_info);
+                if (ret < 0) {
+                        dev_err(&host->pdev->dev, "failed to setup"
+                                "dispdrv:%s\n", host->dispdrv->drv->name);
+                        return;
+                }
+        }
+
         if (host->reg_lcd) {
                 ret = regulator_enable(host->reg_lcd);
                 if (ret) {
@@ -476,6 +489,13 @@ static void mxsfb_enable_controller(struct fb_info *fb_info)
         writel(CTRL1_RECOVERY_ON_UNDERFLOW, host->base + LCDC_CTRL1 + REG_SET);
 
         host->enabled = 1;
+
+        if (host->dispdrv && host->dispdrv->drv->enable) {
+                ret = host->dispdrv->drv->enable(host->dispdrv, fb_info);
+                if (ret < 0)
+                        dev_err(&host->pdev->dev, "failed to enable "
+                                "dispdrv:%s\n", host->dispdrv->drv->name);
+        }
 }
 
 static void mxsfb_disable_controller(struct fb_info *fb_info)
@@ -487,6 +507,9 @@ static void mxsfb_disable_controller(struct fb_info *fb_info)
 
         dev_dbg(&host->pdev->dev, "%s\n", __func__);
 
+        if (host->dispdrv && host->dispdrv->drv->disable)
+                host->dispdrv->drv->disable(host->dispdrv, fb_info);
+
         clk_enable_axi(host);
         clk_enable_disp_axi(host);
         /*
@@ -954,6 +977,7 @@ static int mxsfb_init_fbinfo_dt(struct mxsfb_info *host)
         struct device_node *display_np;
         struct device_node *timings_np;
         struct display_timings *timings;
+        const char *disp_dev;
         u32 width;
         int i;
         int ret = 0;
@@ -996,6 +1020,13 @@ static int mxsfb_init_fbinfo_dt(struct mxsfb_info *host)
                 goto put_display_node;
         }
 
+        ret = of_property_read_string(np, "disp-dev", &disp_dev);
+        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) {
                 dev_err(dev, "failed to get display timings\n");
@@ -1081,6 +1112,29 @@ static int mxsfb_init_fbinfo(struct mxsfb_info *host)
         return 0;
 }
 
+static void mxsfb_dispdrv_init(struct platform_device *pdev,
+                              struct fb_info *fbi)
+{
+        struct mxsfb_info *host = to_imxfb_host(fbi);
+        struct mxc_dispdrv_setting setting;
+        struct device *dev = &pdev->dev;
+        char disp_dev[32];
+
+        setting.fbi = fbi;
+        memcpy(disp_dev, host->disp_dev, strlen(host->disp_dev));
+        disp_dev[strlen(host->disp_dev)] = '\0';
+
+        host->dispdrv = mxc_dispdrv_gethandle(disp_dev, &setting);
+        if (IS_ERR(host->dispdrv)) {
+                host->dispdrv = NULL;
+                dev_info(dev, "failed to find mxc display driver %s\n",
+                         disp_dev);
+        } else {
+                dev_info(dev, "registered mxc display driver %s\n",
+                         disp_dev);
+        }
+}
+
 static void mxsfb_free_videomem(struct mxsfb_info *host)
 {
         struct fb_info *fb_info = &host->fb_info;
@@ -1211,12 +1265,6 @@ static int mxsfb_probe(struct platform_device *pdev)
 
         host->devdata = &mxsfb_devdata[pdev->id_entry->driver_data];
 
-        pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-        if (IS_ERR(pinctrl)) {
-                ret = PTR_ERR(pinctrl);
-                goto fb_release;
-        }
-
         host->clk_pix = devm_clk_get(&host->pdev->dev, "pix");
         if (IS_ERR(host->clk_pix)) {
                 host->clk_pix = NULL;
@@ -1257,6 +1305,16 @@ static int mxsfb_probe(struct platform_device *pdev)
         if (ret != 0)
                 goto fb_pm_runtime_disable;
 
+        mxsfb_dispdrv_init(pdev, fb_info);
+
+        if (!host->dispdrv) {
+                pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+                if (IS_ERR(pinctrl)) {
+                        ret = PTR_ERR(pinctrl);
+                        goto fb_pm_runtime_disable;
+                }
+        }
+
         platform_set_drvdata(pdev, fb_info);
 
         if (!host->enabled) {