From patchwork Thu Jun 17 05:12:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nagarajan, Rajkumar" X-Patchwork-Id: 106610 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5H5Cftt023008 for ; Thu, 17 Jun 2010 05:12:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752174Ab0FQFMY (ORCPT ); Thu, 17 Jun 2010 01:12:24 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:40806 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751065Ab0FQFMX convert rfc822-to-8bit (ORCPT ); Thu, 17 Jun 2010 01:12:23 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o5H5CK55031700 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 17 Jun 2010 00:12:22 -0500 Received: from dbde71.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id o5H5CJRQ007155 for ; Thu, 17 Jun 2010 10:42:19 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde71.ent.ti.com ([172.24.170.149]) with mapi; Thu, 17 Jun 2010 10:42:19 +0530 From: "Nagarajan, Rajkumar" To: "linux-omap@vger.kernel.org" Date: Thu, 17 Jun 2010 10:42:18 +0530 Subject: [PATCH] OMAP: DSS: Fix for dsi_pll to dpll4 clk switch Thread-Topic: [PATCH] OMAP: DSS: Fix for dsi_pll to dpll4 clk switch Thread-Index: AcsN3KFTH1TMfQNTQKKa6PBLc7N3wg== Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 17 Jun 2010 05:12:42 +0000 (UTC) diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index 960e977..5d778d6 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c @@ -214,10 +214,15 @@ void omapdss_dpi_display_disable(struct omap_dss_device *dssdev) #ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL dss_select_dispc_clk_source(DSS_SRC_DSS1_ALWON_FCLK); + dispc_go(OMAP_DSS_CHANNEL_LCD); + while (dispc_go_busy(OMAP_DSS_CHANNEL_LCD)) + ; dsi_pll_uninit(); dss_clk_disable(DSS_CLK_FCK2); #endif + dispc_enable_channel(OMAP_DSS_CHANNEL_LCD, 0); + dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1); if (cpu_is_omap34xx())