fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info

sh_mipi uses some clocks, but the method of setup depends on CPU.

Current SuperH (like sh73a0) can control all of these clocks
by CPG (Clock Pulse Generator).
It means we can control it by clock framework only.
But on sh7372, it needs CPG settings AND sh_mipi PHYCTRL::PLLDS,
and only sh7372 has PHYCTRL::PLLDS.

But on current sh_mipi driver, PHYCTRL::PLLDS of sh7372 was
overwrote since the callback timing of clock setting was changed
by c2658b70f06108361aa5024798f9c1bf47c73374
(fbdev: sh_mipi_dsi: fixup setup timing of sh_mipi_setup()).
To solve this issue, this patch adds extra .phyctrl.

This patch adds detail explanation for unclear mipi settings
and fixup wrong PHYCTRL::PLLDS value for ap4evb (0xb -> 0x6).

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 82483d5f200c4cb7a4c1691f1a2114a819c8d20c..581ec66eef964c87965e664691f0cb77f2f00867 100644 (file)
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -486,20 +486,25 @@ static struct platform_device keysc_device = {
 };
 
 /* MIPI-DSI */
-#define PHYCTRL                0x0070
 static int sh_mipi_set_dot_clock(struct platform_device *pdev,
                                 void __iomem *base,
                                 int enable)
 {
        struct clk *pck = clk_get(&pdev->dev, "dsip_clk");
-       void __iomem *phy =  base + PHYCTRL;
 
        if (IS_ERR(pck))
                return PTR_ERR(pck);
 
        if (enable) {
+               /*
+                * DSIPCLK      = 24MHz
+                * D-PHY        = DSIPCLK * ((0x6*2)+1) = 312MHz (see .phyctrl)
+                * HsByteCLK    = D-PHY/8 = 39MHz
+                *
+                *  X * Y * FPS =
+                * (544+72+600+16) * (961+8+8+2) * 30 = 36.1MHz
+                */
                clk_set_rate(pck, clk_round_rate(pck, 24000000));
-               iowrite32(ioread32(phy) | (0xb << 8), phy);
                clk_enable(pck);
        } else {
                clk_disable(pck);
@@ -530,6 +535,7 @@ static struct sh_mipi_dsi_info mipidsi0_info = {
        .lcd_chan       = &lcdc_info.ch[0],
        .lane           = 2,
        .vsynw_offset   = 17,
+       .phyctrl        = 0x6 << 8,
        .flags          = SH_MIPI_DSI_SYNC_PULSES_MODE |
                          SH_MIPI_DSI_HSbyteCLK,
        .set_dot_clock  = sh_mipi_set_dot_clock,

diff --git a/drivers/video/sh_mipi_dsi.c b/drivers/video/sh_mipi_dsi.c
index 42ad0f707e88f662866ba3fda11abdebb75502e3..4c6b84488561ba370a25f65bdaa16f40724cca9b 100644 (file)
--- a/drivers/video/sh_mipi_dsi.c
+++ b/drivers/video/sh_mipi_dsi.c
@@ -273,7 +273,7 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
        iowrite32(0x00000001, base + PHYCTRL);
        udelay(200);
        /* Deassert resets, power on */
-       iowrite32(0x03070001, base + PHYCTRL);
+       iowrite32(0x03070001 | pdata->phyctrl, base + PHYCTRL);
 
        /*
         * Default = ULPS enable |

diff --git a/include/video/sh_mipi_dsi.h b/include/video/sh_mipi_dsi.h
index 434d56b4a1a58db0ab4b4c08993b1630e70d235b..06c67fbc4eee471f8871fd3892f87be5712c2e00 100644 (file)
--- a/include/video/sh_mipi_dsi.h
+++ b/include/video/sh_mipi_dsi.h
@@ -51,6 +51,7 @@ struct sh_mipi_dsi_info {
        int                             lane;
        unsigned long                   flags;
        u32                             clksrc;
+       u32                             phyctrl; /* for extra setting */
        unsigned int                    vsynw_offset;
        int     (*set_dot_clock)(struct platform_device *pdev,
                                 void __iomem *base,