add rga2 pd_clk support
authorzsq <zsq@rock-chips.com>
Wed, 25 Mar 2015 09:09:26 +0000 (17:09 +0800)
committerzsq <zsq@rock-chips.com>
Wed, 25 Mar 2015 09:09:26 +0000 (17:09 +0800)
drivers/video/rockchip/rga2/rga2_drv.c

index c0f4b438c22ce916a2ea39a5ba9b0edd2fe5d5b6..0856bff51dbf658fe68bcf61f20b9bb3c5797253 100755 (executable)
@@ -234,7 +234,7 @@ static void rga2_power_on(void)
     clk_prepare_enable(rga2_drvdata->rga2);\r
        clk_prepare_enable(rga2_drvdata->aclk_rga2);\r
        clk_prepare_enable(rga2_drvdata->hclk_rga2);\r
-       //clk_enable(rga2_drvdata->pd_rga2);\r
+       clk_prepare_enable(rga2_drvdata->pd_rga2);\r
        wake_lock(&rga2_drvdata->wake_lock);\r
        rga2_service.enable = true;\r
 }\r
@@ -256,9 +256,8 @@ static void rga2_power_off(void)
                rga2_dump();\r
        }\r
 \r
-       //clk_disable(rga2_drvdata->pd_rga2);\r
     clk_disable_unprepare(rga2_drvdata->rga2);\r
-    //clk_disable_unprepare(rga2_drvdata->pd_rga2);\r
+    clk_disable_unprepare(rga2_drvdata->pd_rga2);\r
        clk_disable_unprepare(rga2_drvdata->aclk_rga2);\r
        clk_disable_unprepare(rga2_drvdata->hclk_rga2);\r
        wake_unlock(&rga2_drvdata->wake_lock);\r
@@ -974,13 +973,10 @@ static long compat_rga_ioctl(struct file *file, uint32_t cmd, unsigned long arg)
             RGA_MSG_2_RGA2_MSG_32(&req_rga, &req);\r
 \r
             if((atomic_read(&rga2_service.total_running) > 8))\r
-            {\r
                            ret = rga2_blit_sync(session, &req);\r
-            }\r
             else\r
-            {\r
                 ret = rga2_blit_async(session, &req);\r
-            }\r
+\r
                        break;\r
                case RGA2_BLIT_SYNC:\r
                if (unlikely(copy_from_user(&req, compat_ptr((compat_uptr_t)arg), sizeof(struct rga2_req))))\r
@@ -1000,13 +996,10 @@ static long compat_rga_ioctl(struct file *file, uint32_t cmd, unsigned long arg)
                }\r
 \r
             if((atomic_read(&rga2_service.total_running) > 16))\r
-            {\r
                            ret = rga2_blit_sync(session, &req);\r
-            }\r
             else\r
-            {\r
                 ret = rga2_blit_async(session, &req);\r
-            }\r
+\r
                        break;\r
         case RGA_FLUSH:\r
                case RGA2_FLUSH:\r
@@ -1258,7 +1251,8 @@ static int rga2_drv_remove(struct platform_device *pdev)
        iounmap((void __iomem *)(data->rga_base));\r
 \r
        //clk_put(data->pd_rga2);\r
-    devm_clk_put(&pdev->dev, data->rga2);\r
+       devm_clk_put(&pdev->dev, data->rga2);\r
+    devm_clk_put(&pdev->dev, data->pd_rga2);\r
        devm_clk_put(&pdev->dev, data->aclk_rga2);\r
        devm_clk_put(&pdev->dev, data->hclk_rga2);\r
 \r