MALI: midgard: rockchip: not to enable clk_gpu when probing
authorchenzhen <chenzhen@rock-chips.com>
Thu, 30 Jun 2016 06:54:11 +0000 (14:54 +0800)
committerGerrit Code Review <gerrit@rock-chips.com>
Mon, 4 Jul 2016 07:22:48 +0000 (15:22 +0800)
Otherwise, clk_gpu won't be disabled actually in the runtime.

Change-Id: If1e32061cbffc1564a5cf95fbf01aa91c827550d
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
drivers/gpu/arm/midgard/mali_kbase_core_linux.c

index 061c8df68bfb713380280b774c45bd0651a9c522..5b56e8b0693acba914165ccdc5a884c6cdfa3dd4 100644 (file)
@@ -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;
        }