From c12eb17340c90086f378c239da3d9015e7878f0c Mon Sep 17 00:00:00 2001 From: Thomas Fleury Date: Wed, 21 Jun 2017 11:13:22 -0700 Subject: gpu: nvgpu: move mclk related functions to clk Move mclk related functions be moved to clk structure instead of pmu. We want to keep pmu only for basic pmu interaction and split clk, lpwr etc. Bug 1921094 Change-Id: I32394bc0e6d3657dfbd34dbcf19c9af56c12e194 Signed-off-by: Thomas Fleury Reviewed-on: https://git-master/r/1506586 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/gk20a.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 06db2b7f..9b28e0c6 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h @@ -772,9 +772,6 @@ struct gpu_ops { void *lsfm, u32 *p_bl_gen_desc_size); int (*flcn_populate_bl_dmem_desc)(struct gk20a *g, void *lsfm, u32 *p_bl_gen_desc_size, u32 falconid); - int (*mclk_init)(struct gk20a *g); - void (*mclk_deinit)(struct gk20a *g); - int (*mclk_change)(struct gk20a *g, u16 val); void (*handle_ext_irq)(struct gk20a *g, u32 intr); void (*set_irqmask)(struct gk20a *g); u32 lspmuwprinitdone; @@ -802,6 +799,9 @@ struct gpu_ops { int (*pll_reg_write)(struct gk20a *g, u32 reg, u32 val); int (*get_pll_debug_data)(struct gk20a *g, struct nvgpu_clk_pll_debug_data *d); + int (*mclk_init)(struct gk20a *g); + void (*mclk_deinit)(struct gk20a *g); + int (*mclk_change)(struct gk20a *g, u16 val); } clk; struct { u32 (*get_arbiter_clk_domains)(struct gk20a *g); -- cgit v1.2.2