fbdev: sh_mipi_dsi: fixup setup timing of sh_mipi_setup()
[firefly-linux-kernel-4.4.55.git] / drivers / video / sh_mipi_dsi.c
index 24640c8458ab7f6e861c9c39b41c42c5726d7c00..f2c3f945f77b2ed595d2d9cbf6313af98838f3e0 100644 (file)
@@ -8,6 +8,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/bitmap.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -17,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/types.h>
+#include <linux/module.h>
 
 #include <video/mipi_display.h>
 #include <video/sh_mipi_dsi.h>
@@ -40,6 +42,7 @@
 #define VMCTR1         0x0020
 #define VMCTR2         0x0024
 #define VMLEN1         0x0028
+#define VMLEN2         0x002c
 #define CMTSRTREQ      0x0070
 #define CMTSRTCTR      0x00d0
 
@@ -50,8 +53,7 @@ struct sh_mipi {
        void __iomem    *base;
        void __iomem    *linkbase;
        struct clk      *dsit_clk;
-       struct clk      *dsip_clk;
-       struct device   *dev;
+       struct platform_device *pdev;
 
        void    *next_board_data;
        void    (*next_display_on)(void *board_data, struct fb_info *info);
@@ -123,35 +125,15 @@ static void sh_mipi_shutdown(struct platform_device *pdev)
        sh_mipi_dsi_enable(mipi, false);
 }
 
-static void mipi_display_on(void *arg, struct fb_info *info)
-{
-       struct sh_mipi *mipi = arg;
-
-       pm_runtime_get_sync(mipi->dev);
-       sh_mipi_dsi_enable(mipi, true);
-
-       if (mipi->next_display_on)
-               mipi->next_display_on(mipi->next_board_data, info);
-}
-
-static void mipi_display_off(void *arg)
-{
-       struct sh_mipi *mipi = arg;
-
-       if (mipi->next_display_off)
-               mipi->next_display_off(mipi->next_board_data);
-
-       sh_mipi_dsi_enable(mipi, false);
-       pm_runtime_put(mipi->dev);
-}
-
 static int __init sh_mipi_setup(struct sh_mipi *mipi,
                                struct sh_mipi_dsi_info *pdata)
 {
        void __iomem *base = mipi->base;
        struct sh_mobile_lcdc_chan_cfg *ch = pdata->lcd_chan;
-       u32 pctype, datatype, pixfmt, linelength, vmctr2 = 0x00e00000;
+       u32 pctype, datatype, pixfmt, linelength, vmctr2;
+       u32 tmp, top, bottom, delay, div;
        bool yuv;
+       int bpp;
 
        /*
         * Select data format. MIPI DSI is not hot-pluggable, so, we just use
@@ -252,6 +234,9 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
            (!yuv && ch->interface_type != RGB24))
                return -EINVAL;
 
+       if (!pdata->lane)
+               return -EINVAL;
+
        /* reset DSI link */
        iowrite32(0x00000001, base + SYSCTRL);
        /* Hold reset for 100 cycles of the slowest of bus, HS byte and LP clock */
@@ -268,7 +253,10 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
         *      ECC check enable
         * additionally enable first two lanes
         */
-       iowrite32(0x00003703, base + SYSCONF);
+       bitmap_fill((unsigned long *)&tmp, pdata->lane);
+       tmp |= 0x00003700;
+       iowrite32(tmp, base + SYSCONF);
+
        /*
         * T_wakeup = 0x7000
         * T_hs-trail = 3
@@ -296,8 +284,8 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
        /* DSI-Tx bias on */
        iowrite32(0x00000001, base + PHYCTRL);
        udelay(200);
-       /* Deassert resets, power on, set multiplier */
-       iowrite32(0x03070b01, base + PHYCTRL);
+       /* Deassert resets, power on */
+       iowrite32(0x03070001, base + PHYCTRL);
 
        /* setup l-bridge */
 
@@ -315,18 +303,68 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
         * Non-burst mode with sync pulses: VSE and HSE are output,
         * HSA period allowed, no commands in LP
         */
+       vmctr2 = 0;
+       if (pdata->flags & SH_MIPI_DSI_VSEE)
+               vmctr2 |= 1 << 23;
+       if (pdata->flags & SH_MIPI_DSI_HSEE)
+               vmctr2 |= 1 << 22;
+       if (pdata->flags & SH_MIPI_DSI_HSAE)
+               vmctr2 |= 1 << 21;
+       if (pdata->flags & SH_MIPI_DSI_BL2E)
+               vmctr2 |= 1 << 17;
        if (pdata->flags & SH_MIPI_DSI_HSABM)
-               vmctr2 |= 0x20;
-       if (pdata->flags & SH_MIPI_DSI_HSPBM)
-               vmctr2 |= 0x10;
+               vmctr2 |= 1 << 5;
+       if (pdata->flags & SH_MIPI_DSI_HBPBM)
+               vmctr2 |= 1 << 4;
+       if (pdata->flags & SH_MIPI_DSI_HFPBM)
+               vmctr2 |= 1 << 3;
        iowrite32(vmctr2, mipi->linkbase + VMCTR2);
 
        /*
-        * 0x660 = 1632 bytes per line (RGB24, 544 pixels: see
-        * sh_mobile_lcdc_info.ch[0].lcd_cfg[0].xres), HSALEN = 1 - default
-        * (unused if VMCTR2[HSABM] = 0)
+        * VMLEN1 = RGBLEN | HSALEN
+        *
+        * see
+        *  Video mode - Blanking Packet setting
+        */
+       top = linelength << 16; /* RGBLEN */
+       bottom = 0x00000001;
+       if (pdata->flags & SH_MIPI_DSI_HSABM) /* HSALEN */
+               bottom = (pdata->lane * ch->lcd_cfg[0].hsync_len) - 10;
+       iowrite32(top | bottom , mipi->linkbase + VMLEN1);
+
+       /*
+        * VMLEN2 = HBPLEN | HFPLEN
+        *
+        * see
+        *  Video mode - Blanking Packet setting
         */
-       iowrite32(1 | (linelength << 16), mipi->linkbase + VMLEN1);
+       top     = 0x00010000;
+       bottom  = 0x00000001;
+       delay   = 0;
+
+       div = 1;        /* HSbyteCLK is calculation base
+                        * HS4divCLK = HSbyteCLK/2
+                        * HS6divCLK is not supported for now */
+       if (pdata->flags & SH_MIPI_DSI_HS4divCLK)
+               div = 2;
+
+       if (pdata->flags & SH_MIPI_DSI_HFPBM) { /* HBPLEN */
+               top = ch->lcd_cfg[0].hsync_len + ch->lcd_cfg[0].left_margin;
+               top = ((pdata->lane * top / div) - 10) << 16;
+       }
+       if (pdata->flags & SH_MIPI_DSI_HBPBM) { /* HFPLEN */
+               bottom = ch->lcd_cfg[0].right_margin;
+               bottom = (pdata->lane * bottom / div) - 12;
+       }
+
+       bpp = linelength / ch->lcd_cfg[0].xres; /* byte / pixel */
+       if ((pdata->lane / div) > bpp) {
+               tmp = ch->lcd_cfg[0].xres / bpp; /* output cycle */
+               tmp = ch->lcd_cfg[0].xres - tmp; /* (input - output) cycle */
+               delay = (pdata->lane * tmp);
+       }
+
+       iowrite32(top | (bottom + delay) , mipi->linkbase + VMLEN2);
 
        msleep(5);
 
@@ -354,6 +392,50 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
        return 0;
 }
 
+static void mipi_display_on(void *arg, struct fb_info *info)
+{
+       struct sh_mipi *mipi = arg;
+       struct sh_mipi_dsi_info *pdata = mipi->pdev->dev.platform_data;
+       int ret;
+
+       pm_runtime_get_sync(&mipi->pdev->dev);
+
+       ret = pdata->set_dot_clock(mipi->pdev, mipi->base, 1);
+       if (ret < 0)
+               goto mipi_display_on_fail1;
+
+       ret = sh_mipi_setup(mipi, pdata);
+       if (ret < 0)
+               goto mipi_display_on_fail2;
+
+       sh_mipi_dsi_enable(mipi, true);
+
+       if (mipi->next_display_on)
+               mipi->next_display_on(mipi->next_board_data, info);
+
+       return;
+
+mipi_display_on_fail1:
+       pm_runtime_put_sync(&mipi->pdev->dev);
+mipi_display_on_fail2:
+       pdata->set_dot_clock(mipi->pdev, mipi->base, 0);
+}
+
+static void mipi_display_off(void *arg)
+{
+       struct sh_mipi *mipi = arg;
+       struct sh_mipi_dsi_info *pdata = mipi->pdev->dev.platform_data;
+
+       if (mipi->next_display_off)
+               mipi->next_display_off(mipi->next_board_data);
+
+       sh_mipi_dsi_enable(mipi, false);
+
+       pdata->set_dot_clock(mipi->pdev, mipi->base, 0);
+
+       pm_runtime_put_sync(&mipi->pdev->dev);
+}
+
 static int __init sh_mipi_probe(struct platform_device *pdev)
 {
        struct sh_mipi *mipi;
@@ -362,11 +444,13 @@ static int __init sh_mipi_probe(struct platform_device *pdev)
        struct resource *res2 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
        unsigned long rate, f_current;
        int idx = pdev->id, ret;
-       char dsip_clk[] = "dsi.p_clk";
 
        if (!res || !res2 || idx >= ARRAY_SIZE(mipi_dsi) || !pdata)
                return -ENODEV;
 
+       if (!pdata->set_dot_clock)
+               return -EINVAL;
+
        mutex_lock(&array_lock);
        if (idx < 0)
                for (idx = 0; idx < ARRAY_SIZE(mipi_dsi) && mipi_dsi[idx]; idx++)
@@ -407,7 +491,7 @@ static int __init sh_mipi_probe(struct platform_device *pdev)
                goto emap2;
        }
 
-       mipi->dev = &pdev->dev;
+       mipi->pdev = pdev;
 
        mipi->dsit_clk = clk_get(&pdev->dev, "dsit_clk");
        if (IS_ERR(mipi->dsit_clk)) {
@@ -427,44 +511,15 @@ static int __init sh_mipi_probe(struct platform_device *pdev)
 
        dev_dbg(&pdev->dev, "DSI-T clk %lu -> %lu\n", f_current, rate);
 
-       sprintf(dsip_clk, "dsi%1.1dp_clk", idx);
-       mipi->dsip_clk = clk_get(&pdev->dev, dsip_clk);
-       if (IS_ERR(mipi->dsip_clk)) {
-               ret = PTR_ERR(mipi->dsip_clk);
-               goto eclkpget;
-       }
-
-       f_current = clk_get_rate(mipi->dsip_clk);
-       /* Between 10 and 50MHz */
-       rate = clk_round_rate(mipi->dsip_clk, 24000000);
-       if (rate > 0 && rate != f_current)
-               ret = clk_set_rate(mipi->dsip_clk, rate);
-       else
-               ret = rate;
-       if (ret < 0)
-               goto esetprate;
-
-       dev_dbg(&pdev->dev, "DSI-P clk %lu -> %lu\n", f_current, rate);
-
-       msleep(10);
-
        ret = clk_enable(mipi->dsit_clk);
        if (ret < 0)
                goto eclkton;
 
-       ret = clk_enable(mipi->dsip_clk);
-       if (ret < 0)
-               goto eclkpon;
-
        mipi_dsi[idx] = mipi;
 
        pm_runtime_enable(&pdev->dev);
        pm_runtime_resume(&pdev->dev);
 
-       ret = sh_mipi_setup(mipi, pdata);
-       if (ret < 0)
-               goto emipisetup;
-
        mutex_unlock(&array_lock);
        platform_set_drvdata(pdev, mipi);
 
@@ -481,16 +536,7 @@ static int __init sh_mipi_probe(struct platform_device *pdev)
 
        return 0;
 
-emipisetup:
-       mipi_dsi[idx] = NULL;
-       pm_runtime_disable(&pdev->dev);
-       clk_disable(mipi->dsip_clk);
-eclkpon:
-       clk_disable(mipi->dsit_clk);
 eclkton:
-esetprate:
-       clk_put(mipi->dsip_clk);
-eclkpget:
 esettrate:
        clk_put(mipi->dsit_clk);
 eclktget:
@@ -541,10 +587,9 @@ static int __exit sh_mipi_remove(struct platform_device *pdev)
        pdata->lcd_chan->board_cfg.board_data = NULL;
 
        pm_runtime_disable(&pdev->dev);
-       clk_disable(mipi->dsip_clk);
        clk_disable(mipi->dsit_clk);
        clk_put(mipi->dsit_clk);
-       clk_put(mipi->dsip_clk);
+
        iounmap(mipi->linkbase);
        if (res2)
                release_mem_region(res2->start, resource_size(res2));