Skip to content

Commit aaa43b1

Browse files
Zhen Chenrkhuangtao
authored andcommitted
MALI Utgard: RK: only prepare clk_gpu not enable it in mali_probe()
Change-Id: I53b2b9e0a277bedc4a15899ae680ed944219f7bf Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
1 parent 711af44 commit aaa43b1

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -588,9 +588,9 @@ static int mali_probe(struct platform_device *pdev)
588588
mdev->clock = NULL;
589589
/* Allow probe to continue without clock. */
590590
} else {
591-
err = clk_prepare_enable(mdev->clock);
591+
err = clk_prepare(mdev->clock);
592592
if (err) {
593-
MALI_PRINT_ERROR(("Failed to prepare and enable clock (%d)\n", err));
593+
MALI_PRINT_ERROR(("Failed to prepare clock (%d)\n", err));
594594
goto clock_prepare_failed;
595595
}
596596
}
@@ -640,7 +640,7 @@ static int mali_probe(struct platform_device *pdev)
640640
devfreq_init_failed:
641641
mali_pm_metrics_term(mdev);
642642
pm_metrics_init_failed:
643-
clk_disable_unprepare(mdev->clock);
643+
clk_unprepare(mdev->clock);
644644
clock_prepare_failed:
645645
clk_put(mdev->clock);
646646
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) && defined(CONFIG_OF) \
@@ -680,7 +680,7 @@ static int mali_remove(struct platform_device *pdev)
680680
mali_pm_metrics_term(mdev);
681681

682682
if (mdev->clock) {
683-
clk_disable_unprepare(mdev->clock);
683+
clk_unprepare(mdev->clock);
684684
clk_put(mdev->clock);
685685
mdev->clock = NULL;
686686
}

0 commit comments

Comments
 (0)