From: chenzhen <chenzhen@rock-chips.com>
Date: Thu, 30 Jun 2016 06:54:11 +0000 (+0800)
Subject: MALI: midgard: rockchip: not to enable clk_gpu when probing
X-Git-Tag: firefly_0821_release~2248
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0556935fb1fceb9cef44c1cc7d49eeb702b89e5f;p=firefly-linux-kernel-4.4.55.git

MALI: midgard: rockchip: not to enable clk_gpu when probing

Otherwise, clk_gpu won't be disabled actually in the runtime.

Change-Id: If1e32061cbffc1564a5cf95fbf01aa91c827550d
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
---

diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
index 061c8df68bfb..5b56e8b0693a 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
@@ -3376,7 +3376,7 @@ static int power_control_init(struct platform_device *pdev)
 		dev_info(kbdev->dev, "Continuing without Mali clock control\n");
 		/* Allow probe to continue without clock. */
 	} else {
-		err = clk_prepare_enable(kbdev->clock);
+		err = clk_prepare(kbdev->clock);
 		if (err) {
 			dev_err(kbdev->dev,
 				"Failed to prepare and enable clock (%d)\n",
@@ -3426,7 +3426,7 @@ static void power_control_term(struct kbase_device *kbdev)
 #endif
 
 	if (kbdev->clock) {
-		clk_disable_unprepare(kbdev->clock);
+		clk_unprepare(kbdev->clock);
 		clk_put(kbdev->clock);
 		kbdev->clock = NULL;
 	}