From patchwork Thu Jun 9 13:56:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 865142 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p59Dv5lv009936 for ; Thu, 9 Jun 2011 13:58:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758080Ab1FIN52 (ORCPT ); Thu, 9 Jun 2011 09:57:28 -0400 Received: from na3sys009aog102.obsmtp.com ([74.125.149.69]:50027 "EHLO na3sys009aog102.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758027Ab1FIN5Z (ORCPT ); Thu, 9 Jun 2011 09:57:25 -0400 Received: from mail-fx0-f49.google.com ([209.85.161.49]) (using TLSv1) by na3sys009aob102.postini.com ([74.125.148.12]) with SMTP ID DSNKTfDRRAQl5kG862zv/eBaZLCJfKcQFu60@postini.com; Thu, 09 Jun 2011 06:57:25 PDT Received: by mail-fx0-f49.google.com with SMTP id 14so1392858fxm.36 for ; Thu, 09 Jun 2011 06:57:24 -0700 (PDT) Received: by 10.223.27.195 with SMTP id j3mr856197fac.83.1307627844487; Thu, 09 Jun 2011 06:57:24 -0700 (PDT) Received: from localhost.localdomain (a62-248-131-233.elisa-laajakaista.fi [62.248.131.233]) by mx.google.com with ESMTPS id q10sm669900fan.8.2011.06.09.06.57.22 (version=SSLv3 cipher=OTHER); Thu, 09 Jun 2011 06:57:23 -0700 (PDT) From: Tomi Valkeinen To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: b-cousson@ti.com, paul@pwsan.com, khilman@ti.com, Tomi Valkeinen Subject: [PATCHv2 10/28] OMAP: DSS2: DPI: remove unneeded SYSCK enable/disable Date: Thu, 9 Jun 2011 16:56:32 +0300 Message-Id: <1307627810-3768-11-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1307627810-3768-1-git-send-email-tomi.valkeinen@ti.com> References: <1307627810-3768-1-git-send-email-tomi.valkeinen@ti.com> 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.6 (demeter1.kernel.org [140.211.167.41]); Thu, 09 Jun 2011 13:58:07 +0000 (UTC) DSI PLL requires sys_clk to function, and DPI enables sys_clk when it wants to use DSI PLL. However, DSI PLL code already handles enabling sys_clk, so DPI's sys_clk code is extra. Remove the unneeded sys_clk handling from dpi.c. Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/dpi.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index ff6bd30..bab55cd 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c @@ -202,15 +202,14 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev) goto err2; if (dpi_use_dsi_pll(dssdev)) { - dss_clk_enable(DSS_CLK_SYSCK); r = dsi_pll_init(dpi.dsidev, 0, 1); if (r) - goto err3; + goto err2; } r = dpi_set_mode(dssdev); if (r) - goto err4; + goto err3; mdelay(2); @@ -218,12 +217,9 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev) return 0; -err4: - if (dpi_use_dsi_pll(dssdev)) - dsi_pll_uninit(dpi.dsidev, true); err3: if (dpi_use_dsi_pll(dssdev)) - dss_clk_disable(DSS_CLK_SYSCK); + dsi_pll_uninit(dpi.dsidev, true); err2: dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK); if (cpu_is_omap34xx()) @@ -242,7 +238,6 @@ void omapdss_dpi_display_disable(struct omap_dss_device *dssdev) if (dpi_use_dsi_pll(dssdev)) { dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK); dsi_pll_uninit(dpi.dsidev, true); - dss_clk_disable(DSS_CLK_SYSCK); } dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK);