From patchwork Wed May 18 11:10:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damian Hobson-Garcia X-Patchwork-Id: 793462 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4IBDGCc012239 for ; Wed, 18 May 2011 11:13:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932879Ab1ERLJG (ORCPT ); Wed, 18 May 2011 07:09:06 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:58604 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932125Ab1ERLJF (ORCPT ); Wed, 18 May 2011 07:09:05 -0400 Received: by mail-pz0-f46.google.com with SMTP id 9so654128pzk.19 for ; Wed, 18 May 2011 04:09:05 -0700 (PDT) Received: by 10.68.20.138 with SMTP id n10mr2705017pbe.280.1305716945596; Wed, 18 May 2011 04:09:05 -0700 (PDT) Received: from localhost.localdomain (mailhost.igel.co.jp [219.106.231.130]) by mx.google.com with ESMTPS id l9sm996508pbc.14.2011.05.18.04.09.04 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 18 May 2011 04:09:05 -0700 (PDT) From: Damian Hobson-Garcia To: lethal@linux-sh.org Cc: linux-sh@vger.kernel.org, magnus.damm@gmail.com, taki@igel.co.jp, matsu@igel.co.jp, Damian Hobson-Garcia Subject: [PATCH 6/6] fbdev: sh_mobile_meram: Enable/disable MERAM clocks along with LCDC clocks Date: Wed, 18 May 2011 20:10:11 +0900 Message-Id: <1305717011-20742-7-git-send-email-dhobsong@igel.co.jp> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1305717011-20742-1-git-send-email-dhobsong@igel.co.jp> References: <1305717011-20742-1-git-send-email-dhobsong@igel.co.jp> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 18 May 2011 11:13:18 +0000 (UTC) Signed-off-by: Damian Hobson-Garcia --- drivers/video/sh_mobile_lcdcfb.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index 1c652da..b987647 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c @@ -259,6 +259,11 @@ static void sh_mobile_lcdc_clk_on(struct sh_mobile_lcdc_priv *priv) pm_runtime_get_sync(priv->dev); if (priv->dot_clk) clk_enable(priv->dot_clk); + if (priv->meram_dev) { + struct sh_mobile_meram_info *mdev; + mdev = priv->meram_dev; + mdev->ops->meram_clk_on(mdev); + } } } @@ -267,6 +272,11 @@ static void sh_mobile_lcdc_clk_off(struct sh_mobile_lcdc_priv *priv) if (atomic_sub_return(1, &priv->hw_usecnt) == -1) { if (priv->dot_clk) clk_disable(priv->dot_clk); + if (priv->meram_dev) { + struct sh_mobile_meram_info *mdev; + mdev = priv->meram_dev; + mdev->ops->meram_clk_off(mdev); + } pm_runtime_put(priv->dev); } }