From 8f4a590cf22fa9691953e9be0dca18b399228167 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Tue, 16 May 2017 15:10:22 +0530 Subject: gpu: nvgpu: remove TEGRA_CLK_FRAMEWORK support CONFIG_TEGRA_CLK_FRAMEWORK is no longer supported hence remove this config and all the code that is protected with this config Jira NVGPU-49 Change-Id: Ica28019e0c99e95743216e005ba2fba20357b2d5 Signed-off-by: Deepak Nibade Reviewed-on: http://git-master/r/1483090 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/clk_gk20a.h | 5 ----- drivers/gpu/nvgpu/gk20a/gk20a.h | 2 -- drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c | 4 ---- drivers/gpu/nvgpu/gk20a/hal_gk20a.c | 1 - 4 files changed, 12 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a') diff --git a/drivers/gpu/nvgpu/gk20a/clk_gk20a.h b/drivers/gpu/nvgpu/gk20a/clk_gk20a.h index f07efa40..76f5de43 100644 --- a/drivers/gpu/nvgpu/gk20a/clk_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/clk_gk20a.h @@ -104,11 +104,6 @@ struct clk_gk20a { #endif struct gpu_ops; -#ifdef CONFIG_TEGRA_CLK_FRAMEWORK -void gk20a_init_clk_ops(struct gpu_ops *gops); -#else -static inline void gk20a_init_clk_ops(struct gpu_ops *gops) {} -#endif /* APIs used for both GK20A and GM20B */ unsigned long gk20a_clk_get_rate(struct gk20a *g); diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 3d1e0847..217b1186 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h @@ -1275,8 +1275,6 @@ enum gk20a_nonstall_ops { gk20a_nonstall_ops_post_events = BIT(1), }; -void gk20a_init_clk_ops(struct gpu_ops *gops); - /* register accessors */ int gk20a_lockout_registers(struct gk20a *g); int gk20a_restore_registers(struct gk20a *g); diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c index ff9e0fc1..d7642182 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c @@ -23,7 +23,6 @@ #include #include #include -#include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) #include #endif @@ -717,9 +716,6 @@ static ssize_t fmax_at_vmin_safe_read(struct device *dev, unsigned long gpu_fmax_at_vmin_hz = 0; struct clk *clk = g->clk.tegra_clk; -#ifdef CONFIG_TEGRA_CLK_FRAMEWORK - clk = clk_get_parent(clk); -#endif gpu_fmax_at_vmin_hz = tegra_dvfs_get_fmax_at_vmin_safe_t(clk); return snprintf(buf, PAGE_SIZE, "%d\n", (int)(gpu_fmax_at_vmin_hz)); diff --git a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c index 729a277f..8a3beb39 100644 --- a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c @@ -167,7 +167,6 @@ int gk20a_init_hal(struct gk20a *g) gk20a_init_mm(gops); gk20a_falcon_init_hal(gops); gk20a_init_pmu_ops(gops); - gk20a_init_clk_ops(gops); gk20a_init_regops(gops); gk20a_init_debug_ops(gops); gk20a_init_dbg_session_ops(gops); -- cgit v1.2.2