From 3a6d47db9d00f86d90a1230dd2225bf4ae8944b8 Mon Sep 17 00:00:00 2001 From: Peter Boonstoppel Date: Tue, 25 Oct 2016 13:54:51 -0700 Subject: gpu: nvgpu: Move gk20a clock helper functions to common file This allows us to use these functions with both Tegra and Common Clock Frameworks Bug 200233943 Change-Id: I5a394d7bacfecabeabc64d32dab214d2e7cf89d7 Signed-off-by: Peter Boonstoppel Reviewed-on: http://git-master/r/1242481 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/clk_gk20a.c | 41 ------------------------------------- 1 file changed, 41 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a') diff --git a/drivers/gpu/nvgpu/gk20a/clk_gk20a.c b/drivers/gpu/nvgpu/gk20a/clk_gk20a.c index 26fd1eaf..e3a486b6 100644 --- a/drivers/gpu/nvgpu/gk20a/clk_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/clk_gk20a.c @@ -412,27 +412,6 @@ static int gk20a_init_clk_reset_enable_hw(struct gk20a *g) return 0; } -struct clk *gk20a_clk_get(struct gk20a *g) -{ - if (!g->clk.tegra_clk) { - struct clk *clk; - char clk_dev_id[32]; - struct device *dev = dev_from_gk20a(g); - - snprintf(clk_dev_id, 32, "tegra_%s", dev_name(dev)); - - clk = clk_get_sys(clk_dev_id, "gpu"); - if (IS_ERR(clk)) { - gk20a_err(dev, "fail to get tegra gpu clk %s/gpu\n", - clk_dev_id); - return NULL; - } - g->clk.tegra_clk = clk; - } - - return g->clk.tegra_clk; -} - static int gk20a_init_clk_setup_sw(struct gk20a *g) { struct clk_gk20a *clk = &g->clk; @@ -709,26 +688,6 @@ void gk20a_init_clk_ops(struct gpu_ops *gops) gops->clk.suspend_clk_support = gk20a_suspend_clk_support; } -unsigned long gk20a_clk_get_rate(struct gk20a *g) -{ - struct clk_gk20a *clk = &g->clk; - return rate_gpc2clk_to_gpu(clk->gpc_pll.freq); -} - -long gk20a_clk_round_rate(struct gk20a *g, unsigned long rate) -{ - /* make sure the clock is available */ - if (!gk20a_clk_get(g)) - return rate; - - return clk_round_rate(clk_get_parent(g->clk.tegra_clk), rate); -} - -int gk20a_clk_set_rate(struct gk20a *g, unsigned long rate) -{ - return clk_set_rate(g->clk.tegra_clk, rate); -} - #ifdef CONFIG_DEBUG_FS static int rate_get(void *data, u64 *val) -- cgit v1.2.2