From c1d0a2d670de825af5c32ff921a8c8c5ffd7d6f9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Tue, 15 Jul 2014 17:05:33 +0800 Subject: [PATCH] Revert "rockchip:mali400:tmp not disable mali clk ,enable mali runtime pm" This reverts commit 8c503dc354b3c68f8d069be96e2f687d23fabd4c. --- drivers/clk/clk.c | 2 +- drivers/gpu/arm/mali400/mali/platform/rk30/rk3066.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index f18956ec5394..251c10b63c41 100644 --- 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 dae42a13a9ce..6a1a422610a3 100644 --- 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; -- 2.34.1