From patchwork Wed Dec 14 04:11:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Turquette X-Patchwork-Id: 5662 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 68F8323E11 for ; Wed, 14 Dec 2011 04:16:23 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 5F166A181E7 for ; Wed, 14 Dec 2011 04:16:23 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id k10so50195eaa.11 for ; Tue, 13 Dec 2011 20:16:23 -0800 (PST) Received: by 10.205.120.135 with SMTP id fy7mr197623bkc.54.1323836183173; Tue, 13 Dec 2011 20:16:23 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.129.2 with SMTP id hg2cs100870bkc; Tue, 13 Dec 2011 20:16:23 -0800 (PST) Received: by 10.68.74.161 with SMTP id u1mr970883pbv.65.1323836180750; Tue, 13 Dec 2011 20:16:20 -0800 (PST) Received: from na3sys009aog105.obsmtp.com ([74.125.149.75]) by mx.google.com with SMTP id 3si5000896pbr.265.2011.12.13.20.16.16 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 13 Dec 2011 20:16:20 -0800 (PST) Received-SPF: pass (google.com: domain of mturquette@ti.com designates 74.125.149.75 as permitted sender) client-ip=74.125.149.75; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mturquette@ti.com designates 74.125.149.75 as permitted sender) smtp.mail=mturquette@ti.com Received: from mail-gy0-f176.google.com ([209.85.160.176]) (using TLSv1) by na3sys009aob105.postini.com ([74.125.148.12]) with SMTP ID DSNKTugjEOiO3MwcZKK2wU2tovTz7IecLdqD@postini.com; Tue, 13 Dec 2011 20:16:20 PST Received: by mail-gy0-f176.google.com with SMTP id z10so398183ghb.35 for ; Tue, 13 Dec 2011 20:16:16 -0800 (PST) Received: by 10.236.174.3 with SMTP id w3mr8641934yhl.117.1323836176065; Tue, 13 Dec 2011 20:16:16 -0800 (PST) Received: from localhost.localdomain (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id f47sm2065330yhh.8.2011.12.13.20.16.12 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 13 Dec 2011 20:16:15 -0800 (PST) From: Mike Turquette To: linux@arm.linux.org.uk Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, khilman@ti.com, tony@atomide.com, b-cousson@ti.com, rnayak@ti.com, jeremy.kerr@canonical.com, paul@pwsan.com, broonie@opensource.wolfsonmicro.com, tglx@linutronix.de, linus.walleij@stericsson.com, amit.kucheria@linaro.org, dsaxena@linaro.org, patches@linaro.org, linaro-dev@lists.linaro.org, grant.likely@secretlab.ca, sboyd@quicinc.com, shawn.guo@freescale.com, skannan@quicinc.com, magnus.damm@gmail.com, arnd.bergmann@linaro.org, eric.miao@linaro.org, richard.zhao@linaro.org, mturquette@linaro.org, mturquette@ti.com, andrew@lunn.ch Subject: [PATCH 6/7] omap: dss: use clk_prepare in dss reset Date: Tue, 13 Dec 2011 20:11:57 -0800 Message-Id: <1323835918-2371-7-git-send-email-mturquette@ti.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1323835918-2371-1-git-send-email-mturquette@ti.com> References: <1323835918-2371-1-git-send-email-mturquette@ti.com> Signed-off-by: Mike Turquette --- arch/arm/mach-omap2/display.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index dce9905..21f8fcc 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -297,8 +297,10 @@ int omap_dss_reset(struct omap_hwmod *oh) } for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++) - if (oc->_clk) + if (oc->_clk) { + clk_prepare(oc->_clk); clk_enable(oc->_clk); + } dispc_disable_outputs();