diff options
| author | Andrei Warkentin <andreiw@motorola.com> | 2011-05-03 16:41:08 -0500 |
|---|---|---|
| committer | Rebecca Schultz Zavin <rebecca@android.com> | 2011-05-03 15:21:13 -0700 |
| commit | e9f069bc2c9e0a9e3d7dfd30b66367667ab82dee (patch) | |
| tree | 5f66a9db41b3bb50037b57ef3162e3240e47a2c9 /drivers/video | |
| parent | 82e4366278f9037761488e9b7e03eaff4d90c9c9 (diff) | |
video: tegra: dc: Fix introduced regression.
Removes changes to DC reset flow.
Change-Id: I491b6771c205bec7e19d4c661bb6d376ea8e25e4
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/tegra/dc/dc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c index f39fb40e3ccd..4549670fdff5 100644 --- a/drivers/video/tegra/dc/dc.c +++ b/drivers/video/tegra/dc/dc.c @@ -1044,7 +1044,6 @@ static bool _tegra_dc_enable(struct tegra_dc *dc) dc->out->enable(); tegra_dc_setup_clk(dc, dc->clk); - tegra_periph_reset_assert(dc->clk); clk_enable(dc->clk); clk_enable(dc->emc_clk); tegra_periph_reset_deassert(dc->clk); @@ -1122,6 +1121,10 @@ static void tegra_dc_reset_worker(struct work_struct *work) if (dc->enabled && !dc->suspended) { _tegra_dc_disable(dc); + /* A necessary wait. */ + msleep(100); + tegra_periph_reset_assert(dc->clk); + /* _tegra_dc_enable deasserts reset */ _tegra_dc_enable(dc); } |