[PATCH v2, 07/17] drm/mediatek: add disp config and mm 26mhz clock into mutex device

[Yongqiang Niu]

there are 2 more clock need enable for display.
parser these clock when mutex device probe,
enable and disable when mutex on/off

Signed-off-by: Yongqiang Niu <yongqiang....@mediatek.com>
---
 drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 49 ++++++++++++++++++++++++++++------
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c 
b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
index 60788c1..de618a1 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
@@ -118,7 +118,7 @@ struct mtk_ddp_data {
 
 struct mtk_ddp {
        struct device                   *dev;
-       struct clk                      *clk;
+       struct clk                      *clk[3];
        void __iomem                    *regs;
        struct mtk_disp_mutex           mutex[10];
        const struct mtk_ddp_data       *data;
@@ -257,14 +257,39 @@ int mtk_disp_mutex_prepare(struct mtk_disp_mutex *mutex)
 {
        struct mtk_ddp *ddp = container_of(mutex, struct mtk_ddp,
                                           mutex[mutex->id]);
-       return clk_prepare_enable(ddp->clk);
+       int ret;
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(ddp->clk); i++) {
+               if (IS_ERR(ddp->clk[i]))
+                       continue;
+               ret = clk_prepare_enable(ddp->clk[i]);
+               if (ret) {
+                       pr_err("failed to enable clock, err %d. i:%d\n",
+                               ret, i);
+                       goto err;
+               }
+       }
+
+       return 0;
+
+err:
+       while (--i >= 0)
+               clk_disable_unprepare(ddp->clk[i]);
+       return ret;
 }
 
 void mtk_disp_mutex_unprepare(struct mtk_disp_mutex *mutex)
 {
        struct mtk_ddp *ddp = container_of(mutex, struct mtk_ddp,
                                           mutex[mutex->id]);
-       clk_disable_unprepare(ddp->clk);
+       int i;
+
+        for (i = 0; i < ARRAY_SIZE(ddp->clk); i++) {
+               if (IS_ERR(ddp->clk[i]))
+                       continue;
+               clk_disable_unprepare(ddp->clk[i]);
+       }
 }
 
 void mtk_disp_mutex_add_comp(struct mtk_disp_mutex *mutex,
@@ -415,11 +440,19 @@ static int mtk_ddp_probe(struct platform_device *pdev)
        ddp->data = of_device_get_match_data(dev);
 
        if (!ddp->data->no_clk) {
-               ddp->clk = devm_clk_get(dev, NULL);
-               if (IS_ERR(ddp->clk)) {
-                       if (PTR_ERR(ddp->clk) != -EPROBE_DEFER)
-                               dev_err(dev, "Failed to get clock\n");
-                       return PTR_ERR(ddp->clk);
+               int ret;
+
+               for (i = 0; i < ARRAY_SIZE(ddp->clk); i++) {
+                       ddp->clk[i] = of_clk_get(dev->of_node, i);
+
+                       if (IS_ERR(ddp->clk[i])) {
+                               ret = PTR_ERR(ddp->clk[i]);
+                               if (ret != EPROBE_DEFER)
+                                       dev_err(dev, "Failed to get clock %d\n",
+                                               ret);
+
+                               return ret;
+                       }
                }
        }
 
-- 
1.8.1.1.dirty

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel