video: tegra: host: gk20a: Clean up nvhost_acm deps

In the process of removing nvhost_acm and nvhost_scale dependencies
from the gk20a driver we had to leave some temporary code to allow
building. This patch removes this code.

Bug 1454499

Change-Id: Ie7574caa790e1aaf175942c0736c9017d180300f
Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-on: http://git-master/r/365425
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

diff --git a/drivers/video/tegra/host/gk20a/platform_gk20a_tegra.c b/drivers/video/tegra/host/gk20a/platform_gk20a_tegra.c
index bc9bfe816bd9b390f0178c59aed3b362fba6bcd4..617df8081a142ff61da9fffbaeab4d37958b1f01 100644 (file)
--- a/drivers/video/tegra/host/gk20a/platform_gk20a_tegra.c
+++ b/drivers/video/tegra/host/gk20a/platform_gk20a_tegra.c
@@ -379,10 +379,8 @@ static int gk20a_tegra_get_clocks(struct platform_device *pdev)
                rate = clk_round_rate(c, rate);
                clk_set_rate(c, rate);
                platform->clk[i] = c;
-               platform->nvhost.clk[i] = c;
        }
        platform->num_clks = i;
-       platform->nvhost.num_clks = i;
 
        return 0;
 

diff --git a/drivers/video/tegra/host/gk20a/pmu_gk20a.c b/drivers/video/tegra/host/gk20a/pmu_gk20a.c
index 0db8c1510af80330b879440dcbfa01086c90f144..8b61de3995234b29c6d2f071d856e05fb070b05a 100644 (file)
--- a/drivers/video/tegra/host/gk20a/pmu_gk20a.c
+++ b/drivers/video/tegra/host/gk20a/pmu_gk20a.c
@@ -341,7 +341,7 @@ static int pmu_reset(struct pmu_gk20a *pmu)
 static int pmu_bootstrap(struct pmu_gk20a *pmu)
 {
        struct gk20a *g = pmu->g;
-       struct nvhost_device_data *pdata = platform_get_drvdata(g->dev);
+       struct gk20a_platform *platform = platform_get_drvdata(g->dev);
        struct mm_gk20a *mm = &g->mm;
        struct pmu_ucode_desc *desc = pmu->desc;
        u64 addr_code, addr_data, addr_load;
@@ -360,7 +360,7 @@ static int pmu_bootstrap(struct pmu_gk20a *pmu)
 
        /* TBD: load all other surfaces */
 
-       pmu->args.cpu_freq_HZ = clk_get_rate(pdata->clk[1]);
+       pmu->args.cpu_freq_HZ = clk_get_rate(platform->clk[1]);
 
        addr_args = (pwr_falcon_hwcfg_dmem_size_v(
                gk20a_readl(g, pwr_falcon_hwcfg_r()))