From patchwork Thu Jun 9 13:56:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 865062 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 p59Dv5ln009936 for ; Thu, 9 Jun 2011 13:58:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758039Ab1FIN5U (ORCPT ); Thu, 9 Jun 2011 09:57:20 -0400 Received: from na3sys009aog108.obsmtp.com ([74.125.149.199]:59807 "EHLO na3sys009aog108.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758027Ab1FIN5T (ORCPT ); Thu, 9 Jun 2011 09:57:19 -0400 Received: from mail-fx0-f54.google.com ([209.85.161.54]) (using TLSv1) by na3sys009aob108.postini.com ([74.125.148.12]) with SMTP ID DSNKTfDRPbrNa+S3cD86xqG+wtam2zt0pH2X@postini.com; Thu, 09 Jun 2011 06:57:18 PDT Received: by mail-fx0-f54.google.com with SMTP id 11so1418382fxm.41 for ; Thu, 09 Jun 2011 06:57:17 -0700 (PDT) Received: by 10.223.94.129 with SMTP id z1mr839681fam.144.1307627837772; Thu, 09 Jun 2011 06:57:17 -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.15 (version=SSLv3 cipher=OTHER); Thu, 09 Jun 2011 06:57:16 -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 07/28] OMAP: DSS2: Remove clk optimization at dss init Date: Thu, 9 Jun 2011 16:56:29 +0300 Message-Id: <1307627810-3768-8-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-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@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:06 +0000 (UTC) DSS enables core clocks for the duration of initialization to avoid unnecessary context saves and restores. With PM runtime the clocks cannot be handled in this way, outside the dss module drivers. Thus we need to remove the optimization. Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/core.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index 02187df..f0bae6d 100644 --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c @@ -183,8 +183,6 @@ static int omap_dss_probe(struct platform_device *pdev) goto err_dss; } - /* keep clocks enabled to prevent context saves/restores during init */ - dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK); r = dispc_init_platform_driver(); if (r) { DSSERR("Failed to initialize dispc platform driver\n"); @@ -237,8 +235,6 @@ static int omap_dss_probe(struct platform_device *pdev) pdata->default_device = dssdev; } - dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK); - return 0; err_register: