From 60a9fcb467a631b3631dbd6058b036223d6d89a3 Mon Sep 17 00:00:00 2001 From: Thomas Fleury Date: Sat, 29 Oct 2016 14:11:19 -0700 Subject: gpu: nvgpu: fix clock controls compile Add clock controls only for ARCH_T18x and later. Jira DNVGPU-125 Change-Id: Iab7c831aec925253dd3d9336c653305cb96e052c Signed-off-by: Thomas Fleury Reviewed-on: http://git-master/r/1244932 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/gk20a.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 03bbf72f..8a1df1cc 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c @@ -972,13 +972,13 @@ int gk20a_pm_finalize_poweron(struct device *dev) goto done; } } -#endif err = nvgpu_clk_arb_init_arbiter(g); if (err) { gk20a_err(dev, "failed to init clk arb"); goto done; } +#endif if (g->ops.pmu.is_pmu_supported(g)) { err = gk20a_init_pmu_support(g); @@ -1650,7 +1650,9 @@ static int __exit gk20a_remove(struct platform_device *pdev) if (platform->has_ce) gk20a_ce_destroy(g); +#ifdef CONFIG_ARCH_TEGRA_18x_SOC nvgpu_clk_arb_cleanup_arbiter(g); +#endif gk20a_user_deinit(dev, &nvgpu_class); -- cgit v1.2.2