MLK-17689-1: drm:imx: dcss: Fix DCSS clock selection for MIPI
authorRobert Chiras <robert.chiras@nxp.com>
Tue, 6 Mar 2018 09:56:56 +0000 (11:56 +0200)
committerLeonard Crestez <leonard.crestez@nxp.com>
Wed, 17 Apr 2019 23:51:34 +0000 (02:51 +0300)
Fix the clock source selection for MIPI use-case.

Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
drivers/gpu/imx/dcss/dcss-blkctl.c

index 1687177..21a2fa2 100644 (file)
@@ -81,8 +81,13 @@ void dcss_blkctl_cfg(struct dcss_soc *dcss)
 {
        struct dcss_blkctl_priv *blkctl = dcss->blkctl_priv;
 
-       dcss_writel((blkctl->clk_setting ^ HDMI_MIPI_CLK_SEL),
+       if (blkctl->hdmi_output)
+               dcss_writel((blkctl->clk_setting ^ HDMI_MIPI_CLK_SEL),
                    blkctl->base_reg + DCSS_BLKCTL_CONTROL0);
+       else
+               dcss_writel((blkctl->clk_setting ^ HDMI_MIPI_CLK_SEL) |
+                           DISPMIX_PIXCLK_SEL,
+                           blkctl->base_reg + DCSS_BLKCTL_CONTROL0);
 
        /* deassert clock domains resets */
        dcss_blkctl_clk_reset(blkctl, 0, 0xffffff);