From patchwork Fri Mar 18 21:59:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Vanderlip X-Patchwork-Id: 645371 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2ILxUoR030990 for ; Fri, 18 Mar 2011 21:59:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932831Ab1CRV7a (ORCPT ); Fri, 18 Mar 2011 17:59:30 -0400 Received: from wolverine01.qualcomm.com ([199.106.114.254]:4839 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932835Ab1CRV70 (ORCPT ); Fri, 18 Mar 2011 17:59:26 -0400 X-IronPort-AV: E=McAfee;i="5400,1158,6289"; a="80850518" Received: from ironmsg04-r.qualcomm.com ([172.30.46.18]) by wolverine01.qualcomm.com with ESMTP; 18 Mar 2011 14:59:25 -0700 X-IronPort-AV: E=Sophos;i="4.63,205,1299484800"; d="scan'208";a="37045035" Received: from carlv-linux.qualcomm.com ([10.52.52.151]) by Ironmsg04-R.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 18 Mar 2011 14:59:25 -0700 Received: from carlv-linux.qualcomm.com (localhost [127.0.0.1]) by carlv-linux.qualcomm.com (8.14.2/8.14.2/1.0) with ESMTP id p2ILxP66027596; Fri, 18 Mar 2011 14:59:25 -0700 Received: (from carlv@localhost) by carlv-linux.qualcomm.com (8.14.2/8.12.1/Submit) id p2ILxPf8027595; Fri, 18 Mar 2011 14:59:25 -0700 From: Carl Vanderlip To: David Brown , Daniel Walker , Bryan Huntsman Cc: Brian Swetland , Dima Zavin , Rebecca Schultz Zavin , Colin Cross , linux-fbdev@vger.kernel.org, Carl Vanderlip , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 16/20] video: msm: Set the EBI1 clock to 128MHz when performing blits Date: Fri, 18 Mar 2011 14:59:22 -0700 Message-Id: <1300485562-27560-1-git-send-email-carlv@codeaurora.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1300484846-26393-1-git-send-email-carlv@codeaurora.org> References: <1300484846-26393-1-git-send-email-carlv@codeaurora.org> 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]); Fri, 18 Mar 2011 21:59:30 +0000 (UTC) diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c index b03204d..0bb19fa 100644 --- a/drivers/video/msm/mdp.c +++ b/drivers/video/msm/mdp.c @@ -52,6 +52,7 @@ static int locked_enable_mdp_irq(struct mdp_info *mdp, uint32_t mask) } /* if the mdp irq is not already enabled enable it */ if (!mdp_irq_mask) { + clk_set_rate(mdp->ebi1_clk, 128000000); clk_enable(mdp->clk); enable_irq(mdp->irq); } @@ -656,6 +657,13 @@ int mdp_probe(struct platform_device *pdev) goto error_get_mdp_clk; } + mdp->ebi1_clk = clk_get(NULL, "ebi1_clk"); + if (IS_ERR(mdp->ebi1_clk)) { + pr_err("mdp: failed to get ebi1 clk\n"); + ret = PTR_ERR(mdp->ebi1_clk); + goto error_get_ebi1_clk; + } + ret = request_irq(mdp->irq, mdp_isr, IRQF_DISABLED, "msm_mdp", mdp); if (ret) goto error_request_irq; @@ -681,6 +689,9 @@ int mdp_probe(struct platform_device *pdev) error_device_register: free_irq(mdp->irq, mdp); error_request_irq: + clk_put(mdp->ebi1_clk); +error_get_ebi1_clk: + clk_put(mdp->clk); error_get_mdp_clk: error_mddi_pmdh_register: iounmap(mdp->base); diff --git a/drivers/video/msm/mdp_hw.h b/drivers/video/msm/mdp_hw.h index fdf9e5e..7485a9e 100644 --- a/drivers/video/msm/mdp_hw.h +++ b/drivers/video/msm/mdp_hw.h @@ -46,6 +46,7 @@ struct mdp_info { char * __iomem base; int irq; struct clk *clk; + struct clk *ebi1_clk; struct mdp_out_interface out_if[MSM_MDP_NUM_INTERFACES]; int format; int pack_pattern;