linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mike Turquette <mturquette@ti.com>
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	[thread overview]
Message-ID: <1323835918-2371-7-git-send-email-mturquette@ti.com> (raw)
In-Reply-To: <1323835918-2371-1-git-send-email-mturquette@ti.com>

Signed-off-by: Mike Turquette <mturquette@ti.com>
---
 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();
 
-- 
1.7.5.4


  parent reply	other threads:[~2011-12-14  4:16 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-14  4:11 [PATCH 0/7] RFC: convert OMAP to common struct clk Mike Turquette
2011-12-14  4:11 ` [PATCH 1/7] OMAP: Kconfig: select GENERIC_CLK Mike Turquette
2011-12-14  4:11 ` [PATCH 2/7] HACK: omap4: clk: convert to common struct clk Mike Turquette
     [not found] ` <1323835918-2371-1-git-send-email-mturquette-l0cyMroinI0@public.gmane.org>
2011-12-14  4:11   ` [PATCH 3/7] HACK: omap: convert 44xx data " Mike Turquette
2011-12-14  4:27     ` Paul Walmsley
2011-12-14  4:44       ` Turquette, Mike
2011-12-14  5:29         ` Paul Walmsley
2011-12-14  4:11 ` [PATCH 4/7] omap: hwmod: convert to use " Mike Turquette
2011-12-14  4:11 ` [PATCH 5/7] omap: panda: use clk_prepare in ehci init Mike Turquette
2011-12-14  4:11 ` Mike Turquette [this message]
2011-12-14  4:11 ` [PATCH 7/7] HACK: comment WARN_ON in _clkdm_clk_hwmod_disable Mike Turquette

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1323835918-2371-7-git-send-email-mturquette@ti.com \
    --to=mturquette@ti.com \
    --cc=amit.kucheria@linaro.org \
    --cc=andrew@lunn.ch \
    --cc=arnd.bergmann@linaro.org \
    --cc=b-cousson@ti.com \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=dsaxena@linaro.org \
    --cc=eric.miao@linaro.org \
    --cc=grant.likely@secretlab.ca \
    --cc=jeremy.kerr@canonical.com \
    --cc=khilman@ti.com \
    --cc=linaro-dev@lists.linaro.org \
    --cc=linus.walleij@stericsson.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=magnus.damm@gmail.com \
    --cc=mturquette@linaro.org \
    --cc=patches@linaro.org \
    --cc=paul@pwsan.com \
    --cc=richard.zhao@linaro.org \
    --cc=rnayak@ti.com \
    --cc=sboyd@quicinc.com \
    --cc=shawn.guo@freescale.com \
    --cc=skannan@quicinc.com \
    --cc=tglx@linutronix.de \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).