video: tegra: host: Enable VIC power gating

Bug 1450281

Change-Id: Iba9e970489e5640ca840d37b1d013e7fe053cae3
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/414938
Reviewed-by: Mandar Padmawar <mpadmawar@nvidia.com>
Tested-by: Mandar Padmawar <mpadmawar@nvidia.com>

diff --git a/drivers/video/tegra/host/t124/t124.c b/drivers/video/tegra/host/t124/t124.c
index b258e0957f1f0782f27377c7889ee659e3d6a924..90b50a1c04d2cbda0621d72a208881cf9d77d80d 100644 (file)
--- a/drivers/video/tegra/host/t124/t124.c
+++ b/drivers/video/tegra/host/t124/t124.c
@@ -510,38 +510,6 @@ struct nvhost_device_data t132_tsec_info = {
        .finalize_poweron = nvhost_tsec_finalize_poweron,
 };
 
-#ifdef CONFIG_ARCH_TEGRA_VIC
-struct nvhost_device_data t132_vic_info = {
-       .num_channels   = 1,
-       .modulemutexes          = {NVMODMUTEX_VIC},
-       .clocks                 = {{"vic03", UINT_MAX, 0, TEGRA_MC_CLIENT_VIC},
-                                 {"emc", UINT_MAX} },
-       .version = NVHOST_ENCODE_FLCN_VER(3, 0),
-       NVHOST_MODULE_NO_POWERGATE_IDS,
-       NVHOST_DEFAULT_CLOCKGATE_DELAY,
-       .moduleid      = NVHOST_MODULE_VIC,
-       .alloc_hwctx_handler = nvhost_vic03_alloc_hwctx_handler,
-       .powergate_delay        = 500,
-       .powergate_ids          = { TEGRA_POWERGATE_VIC, -1 },
-       .init                   = nvhost_flcn_init,
-       .deinit                 = nvhost_flcn_deinit,
-       .alloc_hwctx_handler    = nvhost_vic03_alloc_hwctx_handler,
-       .finalize_poweron       = nvhost_vic_finalize_poweron,
-       .prepare_poweroff       = nvhost_vic_prepare_poweroff,
-       .scaling_init           = nvhost_scale3d_init,
-       .scaling_deinit         = nvhost_scale3d_deinit,
-       .busy                   = nvhost_scale_notify_busy,
-       .idle                   = nvhost_scale_notify_idle,
-       .suspend_ndev           = nvhost_scale3d_suspend,
-       .scaling_post_cb        = &nvhost_scale3d_callback,
-       .devfreq_governor       = "nvhost_podgov",
-       .actmon_regs            = HOST1X_CHANNEL_ACTMON2_REG_BASE,
-       .actmon_enabled         = true,
-       .linear_emc             = true,
-       .firmware_name          = "vic03_ucode.bin",
-};
-#endif
-
 static struct {
        struct nvhost_device_data *from;
        struct nvhost_device_data *to;
@@ -551,9 +519,6 @@ static struct {
        {&t124_vi_info, &t132_vi_info},
        {&t124_msenc_info, &t132_msenc_info},
        {&t124_tsec_info, &t132_tsec_info},
-#if defined(CONFIG_ARCH_TEGRA_VIC)
-       {&t124_vic_info, &t132_vic_info},
-#endif
 };
 
 static struct platform_device *t124_devices[] = {