From e9d814ed83329fe74bc11c600a479a5190bf6fc5 Mon Sep 17 00:00:00 2001 From: Matt Wagner Date: Tue, 4 Jun 2013 04:37:58 -0700 Subject: video: tegra: host: Do not reset MC on powerup_reset Change-Id: I2158918b6a22a4ceeadecdfa5a51fc87a624a105 Signed-off-by: Matt Wagner Reviewed-on: http://git-master/r/235510 Reviewed-by: Mandar Padmawar Tested-by: Mandar Padmawar --- drivers/video/tegra/host/nvhost_acm.c | 13 +++++++++++-- 1 file 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; } -- cgit v1.2.3