diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/clk_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/clk_gk20a.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/clk_gk20a.c b/drivers/gpu/nvgpu/gk20a/clk_gk20a.c index 38d4b555..443cd5e1 100644 --- a/drivers/gpu/nvgpu/gk20a/clk_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/clk_gk20a.c | |||
@@ -24,6 +24,8 @@ | |||
24 | 24 | ||
25 | #include "gk20a.h" | 25 | #include "gk20a.h" |
26 | 26 | ||
27 | #include <nvgpu/log.h> | ||
28 | |||
27 | #include <nvgpu/hw/gk20a/hw_trim_gk20a.h> | 29 | #include <nvgpu/hw/gk20a/hw_trim_gk20a.h> |
28 | #include <nvgpu/hw/gk20a/hw_timer_gk20a.h> | 30 | #include <nvgpu/hw/gk20a/hw_timer_gk20a.h> |
29 | 31 | ||
@@ -251,7 +253,7 @@ static int clk_slide_gpc_pll(struct gk20a *g, u32 n) | |||
251 | gk20a_readl(g, trim_sys_gpcpll_ndiv_slowdown_r()); | 253 | gk20a_readl(g, trim_sys_gpcpll_ndiv_slowdown_r()); |
252 | 254 | ||
253 | if (ramp_timeout <= 0) { | 255 | if (ramp_timeout <= 0) { |
254 | gk20a_err(dev_from_gk20a(g), "gpcpll dynamic ramp timeout"); | 256 | nvgpu_err(g, "gpcpll dynamic ramp timeout"); |
255 | return -ETIMEDOUT; | 257 | return -ETIMEDOUT; |
256 | } | 258 | } |
257 | return 0; | 259 | return 0; |
@@ -439,7 +441,7 @@ static int gk20a_init_clk_setup_sw(struct gk20a *g) | |||
439 | 441 | ||
440 | ref = clk_get_parent(clk_get_parent(clk->tegra_clk)); | 442 | ref = clk_get_parent(clk_get_parent(clk->tegra_clk)); |
441 | if (IS_ERR(ref)) { | 443 | if (IS_ERR(ref)) { |
442 | gk20a_err(dev_from_gk20a(g), | 444 | nvgpu_err(g, |
443 | "failed to get GPCPLL reference clock"); | 445 | "failed to get GPCPLL reference clock"); |
444 | err = -EINVAL; | 446 | err = -EINVAL; |
445 | goto fail; | 447 | goto fail; |
@@ -449,7 +451,7 @@ static int gk20a_init_clk_setup_sw(struct gk20a *g) | |||
449 | clk->gpc_pll.id = GK20A_GPC_PLL; | 451 | clk->gpc_pll.id = GK20A_GPC_PLL; |
450 | clk->gpc_pll.clk_in = ref_rate / KHZ; | 452 | clk->gpc_pll.clk_in = ref_rate / KHZ; |
451 | if (clk->gpc_pll.clk_in == 0) { | 453 | if (clk->gpc_pll.clk_in == 0) { |
452 | gk20a_err(dev_from_gk20a(g), | 454 | nvgpu_err(g, |
453 | "GPCPLL reference clock is zero"); | 455 | "GPCPLL reference clock is zero"); |
454 | err = -EINVAL; | 456 | err = -EINVAL; |
455 | goto fail; | 457 | goto fail; |
@@ -508,7 +510,7 @@ static int set_pll_target(struct gk20a *g, u32 freq, u32 old_freq) | |||
508 | /* gpc_pll.freq is changed to new value here */ | 510 | /* gpc_pll.freq is changed to new value here */ |
509 | if (clk_config_pll(clk, &clk->gpc_pll, &gpc_pll_params, | 511 | if (clk_config_pll(clk, &clk->gpc_pll, &gpc_pll_params, |
510 | &freq, true)) { | 512 | &freq, true)) { |
511 | gk20a_err(dev_from_gk20a(g), | 513 | nvgpu_err(g, |
512 | "failed to set pll target for %d", freq); | 514 | "failed to set pll target for %d", freq); |
513 | return -EINVAL; | 515 | return -EINVAL; |
514 | } | 516 | } |
@@ -536,8 +538,7 @@ static int set_pll_freq(struct gk20a *g, u32 freq, u32 old_freq) | |||
536 | /* Just report error but not restore PLL since dvfs could already change | 538 | /* Just report error but not restore PLL since dvfs could already change |
537 | voltage even when it returns error. */ | 539 | voltage even when it returns error. */ |
538 | if (err) | 540 | if (err) |
539 | gk20a_err(dev_from_gk20a(g), | 541 | nvgpu_err(g, "failed to set pll to %d", freq); |
540 | "failed to set pll to %d", freq); | ||
541 | return err; | 542 | return err; |
542 | } | 543 | } |
543 | 544 | ||