From: richard.zhao@linaro.org (Richard Zhao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 9/9] ARM: mxs: convert to clk_prepare/clk_unprepare
Date: Thu, 10 Nov 2011 12:54:14 +0800 [thread overview]
Message-ID: <1320900854-13031-9-git-send-email-richard.zhao@linaro.org> (raw)
In-Reply-To: <1320900854-13031-1-git-send-email-richard.zhao@linaro.org>
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
---
arch/arm/mach-mxs/system.c | 4 +++-
arch/arm/mach-mxs/timer.c | 1 +
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-mxs/system.c b/arch/arm/mach-mxs/system.c
index 20ec3bd..57ce7f7 100644
--- a/arch/arm/mach-mxs/system.c
+++ b/arch/arm/mach-mxs/system.c
@@ -65,8 +65,10 @@ static int __init mxs_arch_reset_init(void)
MX28_CLKCTRL_RESET_OFFSET);
clk = clk_get_sys("rtc", NULL);
- if (!IS_ERR(clk))
+ if (!IS_ERR(clk)) {
+ clk_prepare(clk);
clk_enable(clk);
+ }
return 0;
}
diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c
index cace0d2..ba87b30 100644
--- a/arch/arm/mach-mxs/timer.c
+++ b/arch/arm/mach-mxs/timer.c
@@ -245,6 +245,7 @@ static int __init mxs_clocksource_init(struct clk *timer_clk)
void __init mxs_timer_init(struct clk *timer_clk, int irq)
{
+ clk_prepare(timer_clk);
clk_enable(timer_clk);
/*
--
1.7.5.4
next prev parent reply other threads:[~2011-11-10 4:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-10 4:54 [PATCH 1/9] ARM: mxc: time: convert to clk_prepare/clk_unprepare Richard Zhao
2011-11-10 4:54 ` [PATCH 2/9] ARM: mxc: ahci: " Richard Zhao
2011-11-10 4:54 ` [PATCH 3/9] ARM: mxc: pwm: " Richard Zhao
2011-11-10 4:54 ` [PATCH 4/9] ARM: mxc: epit: " Richard Zhao
2011-11-10 4:54 ` [PATCH 5/9] ARM: mxc: arch_reset: " Richard Zhao
2011-11-10 4:54 ` [PATCH 6/9] ARM: mxc: audmux-v2: " Richard Zhao
2011-11-10 4:54 ` [PATCH 7/9] ARM: pm-imx5: " Richard Zhao
2011-11-10 4:54 ` [PATCH 8/9] ARM: mx31moboard: " Richard Zhao
2011-11-10 4:54 ` Richard Zhao [this message]
2011-11-10 8:03 ` [PATCH 1/9] ARM: mxc: time: " Sascha Hauer
2011-11-10 8:18 ` Richard Zhao
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=1320900854-13031-9-git-send-email-richard.zhao@linaro.org \
--to=richard.zhao@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).