From: Andrei Warkentin <andreiw@motorola.com>
Date: Tue, 3 May 2011 21:41:08 +0000 (-0500)
Subject: video: tegra: dc: Fix introduced regression.
X-Git-Tag: firefly_0821_release~9833^2~2^2~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e9f069bc2c9e0a9e3d7dfd30b66367667ab82dee;p=firefly-linux-kernel-4.4.55.git

video: tegra: dc: Fix introduced regression.

Removes changes to DC reset flow.

Change-Id: I491b6771c205bec7e19d4c661bb6d376ea8e25e4
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
---

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);
 	}