From aaa43b14a5ae83bc242e3b722c25d4d88589f149 Mon Sep 17 00:00:00 2001 From: Zhen Chen Date: Tue, 5 Dec 2017 11:19:06 +0800 Subject: [PATCH] MALI Utgard: RK: only prepare clk_gpu not enable it in mali_probe() Change-Id: I53b2b9e0a277bedc4a15899ae680ed944219f7bf Signed-off-by: Zhen Chen --- drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c index 5839a483453a..ff3e5864e2ad 100755 --- a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c @@ -588,9 +588,9 @@ static int mali_probe(struct platform_device *pdev) mdev->clock = NULL; /* Allow probe to continue without clock. */ } else { - err = clk_prepare_enable(mdev->clock); + err = clk_prepare(mdev->clock); if (err) { - MALI_PRINT_ERROR(("Failed to prepare and enable clock (%d)\n", err)); + MALI_PRINT_ERROR(("Failed to prepare clock (%d)\n", err)); goto clock_prepare_failed; } } @@ -640,7 +640,7 @@ static int mali_probe(struct platform_device *pdev) devfreq_init_failed: mali_pm_metrics_term(mdev); pm_metrics_init_failed: - clk_disable_unprepare(mdev->clock); + clk_unprepare(mdev->clock); clock_prepare_failed: clk_put(mdev->clock); #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) && defined(CONFIG_OF) \ @@ -680,7 +680,7 @@ static int mali_remove(struct platform_device *pdev) mali_pm_metrics_term(mdev); if (mdev->clock) { - clk_disable_unprepare(mdev->clock); + clk_unprepare(mdev->clock); clk_put(mdev->clock); mdev->clock = NULL; }