summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
index 35d524f1..01ff5f96 100644
--- a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
@@ -58,8 +58,8 @@
58extern struct device tegra_vpr_dev; 58extern struct device tegra_vpr_dev;
59 59
60struct gk20a_emc_params { 60struct gk20a_emc_params {
61 long bw_ratio; 61 unsigned long bw_ratio;
62 long freq_last_set; 62 unsigned long freq_last_set;
63}; 63};
64 64
65static void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE); 65static void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE);
@@ -217,7 +217,7 @@ static void gk20a_tegra_postscale(struct device *dev,
217 struct clk *emc_clk = platform->clk[2]; 217 struct clk *emc_clk = platform->clk[2];
218 enum tegra_chipid chip_id = tegra_get_chip_id(); 218 enum tegra_chipid chip_id = tegra_get_chip_id();
219 unsigned long emc_target; 219 unsigned long emc_target;
220 long emc_freq_lower, emc_freq_upper, emc_freq_rounded; 220 unsigned long emc_freq_lower, emc_freq_upper, emc_freq_rounded;
221 221
222 emc_target = gk20a_tegra_get_emc_rate(g, emc_params); 222 emc_target = gk20a_tegra_get_emc_rate(g, emc_params);
223 223
@@ -234,8 +234,10 @@ static void gk20a_tegra_postscale(struct device *dev,
234 break; 234 break;
235 235
236 case TEGRA_CHIPID_TEGRA21: 236 case TEGRA_CHIPID_TEGRA21:
237 emc_freq_lower = tegra_emc_round_rate_updown(emc_target, false); 237 emc_freq_lower = (unsigned long)
238 emc_freq_upper = tegra_emc_round_rate_updown(emc_target, true); 238 tegra_emc_round_rate_updown(emc_target, false);
239 emc_freq_upper = (unsigned long)
240 tegra_emc_round_rate_updown(emc_target, true);
239 241
240 /* round to the nearest frequency step */ 242 /* round to the nearest frequency step */
241 if (emc_target < (emc_freq_lower + emc_freq_upper) / 2) 243 if (emc_target < (emc_freq_lower + emc_freq_upper) / 2)
@@ -645,7 +647,7 @@ static int gk20a_tegra_get_clocks(struct device *dev)
645{ 647{
646 struct gk20a_platform *platform = dev_get_drvdata(dev); 648 struct gk20a_platform *platform = dev_get_drvdata(dev);
647 char devname[16]; 649 char devname[16];
648 int i; 650 unsigned int i;
649 int ret = 0; 651 int ret = 0;
650 652
651 BUG_ON(GK20A_CLKS_MAX < ARRAY_SIZE(tegra_gk20a_clocks)); 653 BUG_ON(GK20A_CLKS_MAX < ARRAY_SIZE(tegra_gk20a_clocks));