Revert "rockchip:mali400:tmp not disable mali clk ,enable mali runtime pm"

This reverts commit 8c503dc354b3c68f8d069be96e2f687d23fabd4c.

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index f18956ec5394041cf7b562df0e8a5b959ed87e31..251c10b63c41b5d38768250d7a78c618e8647388 100644 (file)
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -498,7 +498,7 @@ out:
        return;
 }
 
-static bool clk_ignore_unused = true;
+static bool clk_ignore_unused;
 static int __init clk_ignore_unused_setup(char *__unused)
 {
        clk_ignore_unused = true;

diff --git a/drivers/gpu/arm/mali400/mali/platform/rk30/rk3066.c b/drivers/gpu/arm/mali400/mali/platform/rk30/rk3066.c
index dae42a13a9cea43a0c50856e9ff2c072fb75c60e..6a1a422610a329d9103cfeec92bcf4ba7a5eb63c 100644 (file)
--- a/drivers/gpu/arm/mali400/mali/platform/rk30/rk3066.c
+++ b/drivers/gpu/arm/mali400/mali/platform/rk30/rk3066.c
@@ -73,10 +73,8 @@ static struct mali_gpu_device_data mali_gpu_data =
 };
 static void mali_platform_device_add_config(struct platform_device *pdev)
 {
-#if 0
        if (cpu_is_rk3036())
                mali_gpu_device_device_type.pm = NULL;
-#endif
        pdev->dev.id = 0;
        pdev->dev.release = mali_platform_device_release;
        pdev->dev.type = &mali_gpu_device_device_type;