fbdev: sh_mipi_dsi: use platform provided register layout and values
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Wed, 29 Dec 2010 08:12:29 +0000 (08:12 +0000)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 5 Jan 2011 08:22:32 +0000 (17:22 +0900)
Different sh-mobile SoCs have variations in their MIPI DSI register layouts,
besides, different LCD panels require different configuration parameters. This
patch switches the driver to use platform-provided MIPI DSI parameters.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
drivers/video/sh_mipi_dsi.c

index 23231279c387069491b035a7b7af761c8485ac3a..24640c8458ab7f6e861c9c39b41c42c5726d7c00 100644 (file)
@@ -150,8 +150,7 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
 {
        void __iomem *base = mipi->base;
        struct sh_mobile_lcdc_chan_cfg *ch = pdata->lcd_chan;
-       u32 pctype, datatype, pixfmt;
-       u32 linelength;
+       u32 pctype, datatype, pixfmt, linelength, vmctr2 = 0x00e00000;
        bool yuv;
 
        /*
@@ -308,17 +307,24 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
         */
        iowrite32(0x00000006, mipi->linkbase + DTCTR);
        /* VSYNC width = 2 (<< 17) */
-       iowrite32(0x00040000 | (pctype << 12) | datatype,
+       iowrite32((ch->lcd_cfg[0].vsync_len << pdata->vsynw_offset) |
+                 (pdata->clksrc << 16) | (pctype << 12) | datatype,
                  mipi->linkbase + VMCTR1);
+
        /*
         * Non-burst mode with sync pulses: VSE and HSE are output,
         * HSA period allowed, no commands in LP
         */
-       iowrite32(0x00e00000, mipi->linkbase + VMCTR2);
+       if (pdata->flags & SH_MIPI_DSI_HSABM)
+               vmctr2 |= 0x20;
+       if (pdata->flags & SH_MIPI_DSI_HSPBM)
+               vmctr2 |= 0x10;
+       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, since VMCTR2[HSABM] = 0)
+        * (unused if VMCTR2[HSABM] = 0)
         */
        iowrite32(1 | (linelength << 16), mipi->linkbase + VMLEN1);