diff options
| author | Matt Wagner <mwagner@nvidia.com> | 2013-06-04 04:37:58 -0700 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2013-06-05 05:19:53 -0700 |
| commit | e9d814ed83329fe74bc11c600a479a5190bf6fc5 (patch) | |
| tree | a811950c7691ab552f4e21ffe19b28c8cfc71fbb | |
| parent | b1e29c7914c630f0a9a7bdd57cb27514c13e70a9 (diff) | |
video: tegra: host: Do not reset MC on powerup_reset
Change-Id: I2158918b6a22a4ceeadecdfa5a51fc87a624a105
Signed-off-by: Matt Wagner <mwagner@nvidia.com>
Reviewed-on: http://git-master/r/235510
Reviewed-by: Mandar Padmawar <mpadmawar@nvidia.com>
Tested-by: Mandar Padmawar <mpadmawar@nvidia.com>
| -rw-r--r-- | drivers/video/tegra/host/nvhost_acm.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/video/tegra/host/nvhost_acm.c b/drivers/video/tegra/host/nvhost_acm.c index 8ad7f5121c3b..eb71af9ff0ba 100644 --- a/drivers/video/tegra/host/nvhost_acm.c +++ b/drivers/video/tegra/host/nvhost_acm.c @@ -146,8 +146,17 @@ static void to_state_clockgated_locked(struct platform_device *dev) do_unpowergate_locked(pdata->powergate_ids[0]); do_unpowergate_locked(pdata->powergate_ids[1]); - if (pdata->powerup_reset) - do_module_reset_locked(dev); + if (pdata->powerup_reset) { + if (pdata->clocks[0].reset) + tegra_periph_reset_assert(pdata->clk[0]); + if (pdata->clocks[1].reset) + tegra_periph_reset_assert(pdata->clk[1]); + udelay(POWERGATE_DELAY); + if (pdata->clocks[0].reset) + tegra_periph_reset_deassert(pdata->clk[0]); + if (pdata->clocks[1].reset) + tegra_periph_reset_deassert(pdata->clk[1]); + } } pdata->powerstate = NVHOST_POWER_STATE_CLOCKGATED; } |