From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 4/8] ARM: mxs: request clock for timer
Date: Sun, 29 Apr 2012 00:02:37 +0800 [thread overview]
Message-ID: <1335628961-1340-5-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1335628961-1340-1-git-send-email-shawn.guo@linaro.org>
When mxs_timer_init() does not have a timer_clk passed in, it should
try to request clock from clkdev system.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/mach-mxs/timer.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c
index 564a632..575e8fd 100644
--- a/arch/arm/mach-mxs/timer.c
+++ b/arch/arm/mach-mxs/timer.c
@@ -20,6 +20,7 @@
* MA 02110-1301, USA.
*/
+#include <linux/err.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/clockchips.h>
@@ -245,6 +246,14 @@ static int __init mxs_clocksource_init(struct clk *timer_clk)
void __init mxs_timer_init(struct clk *timer_clk, int irq)
{
+ if (!timer_clk) {
+ timer_clk = clk_get_sys("timrot", NULL);
+ if (IS_ERR(timer_clk)) {
+ pr_err("%s: failed to get clk\n", __func__);
+ return;
+ }
+ }
+
clk_prepare_enable(timer_clk);
/*
--
1.7.5.4
next prev parent reply other threads:[~2012-04-28 16:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-28 16:02 [PATCH v2 0/8] common clk support for mxs Shawn Guo
2012-04-28 16:02 ` [PATCH v2 1/8] clk: mxs: add mxs specific clocks Shawn Guo
2012-04-28 16:02 ` [PATCH v2 2/8] clk: mxs: add clock support for imx23 Shawn Guo
2012-04-28 16:02 ` [PATCH v2 3/8] clk: mxs: add clock support for imx28 Shawn Guo
2012-06-21 17:36 ` Marc Kleine-Budde
2012-04-28 16:02 ` Shawn Guo [this message]
2012-04-28 16:02 ` [PATCH v2 5/8] ARM: mxs: change the lookup name for fec phy clock Shawn Guo
2012-04-28 16:02 ` [PATCH v2 6/8] ARM: mxs: switch to common clk framework Shawn Guo
2012-04-28 16:02 ` [PATCH v2 7/8] ARM: mxs: remove old clock support Shawn Guo
2012-04-28 16:02 ` [PATCH v2 8/8] ARM: mxs: remove now unused timer_clk argument from mxs_timer_init Shawn Guo
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=1335628961-1340-5-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@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).