public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: maxime.ripard@free-electrons.com (Maxime Ripard)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv3 04/10] clocksource: sun4i: Add clocksource and sched clock drivers
Date: Fri,  5 Jul 2013 21:34:31 +0200	[thread overview]
Message-ID: <1373052877-29366-5-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1373052877-29366-1-git-send-email-maxime.ripard@free-electrons.com>

Use the second timer found on the Allwinner SoCs as a clock source and
sched clock, that were both not used yet on these platforms.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 drivers/clocksource/sun4i_timer.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c
index f5e227b..224c855 100644
--- a/drivers/clocksource/sun4i_timer.c
+++ b/drivers/clocksource/sun4i_timer.c
@@ -19,6 +19,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/irqreturn.h>
+#include <linux/sched_clock.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
@@ -96,6 +97,11 @@ static struct irqaction sun4i_timer_irq = {
 	.dev_id = &sun4i_clockevent,
 };
 
+static u32 sun4i_timer_sched_read(void)
+{
+	return ~readl(timer_base + TIMER_CNTVAL_REG(1));
+}
+
 static void __init sun4i_timer_init(struct device_node *node)
 {
 	unsigned long rate = 0;
@@ -117,6 +123,16 @@ static void __init sun4i_timer_init(struct device_node *node)
 
 	rate = clk_get_rate(clk);
 
+	writel(~0, timer_base + TIMER_INTVAL_REG(1));
+	writel(TIMER_CTL_ENABLE | TIMER_CTL_RELOAD |
+	       TIMER_CTL_CLK_SRC(TIMER_CTL_CLK_SRC_OSC24M),
+	       timer_base + TIMER_CTL_REG(1));
+
+	setup_sched_clock(sun4i_timer_sched_read, 32, clk_get_rate(clk));
+	clocksource_mmio_init(timer_base + TIMER_CNTVAL_REG(1), node->name,
+			      clk_get_rate(clk), 300, 32,
+			      clocksource_mmio_readl_down);
+
 	writel(rate / (TIMER_SCAL * HZ),
 	       timer_base + TIMER_INTVAL_REG(0));
 
-- 
1.8.3.2

  parent reply	other threads:[~2013-07-05 19:34 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-05 19:34 [PATCHv3 00/10] clocksource: sunxi: Timer fixes and cleanup Maxime Ripard
2013-07-05 19:34 ` [PATCHv3 01/10] clocksource: sun4i: Use the BIT macros where possible Maxime Ripard
2013-07-05 19:34 ` [PATCHv3 02/10] clocksource: sun4i: Wrap macros arguments in parenthesis Maxime Ripard
2013-07-05 19:34 ` [PATCHv3 03/10] clocksource: sun4i: rename AUTORELOAD define to RELOAD Maxime Ripard
2013-07-05 19:34 ` Maxime Ripard [this message]
2013-07-05 19:34 ` [PATCHv3 05/10] clocksource: sun4i: Don't forget to enable the clock we use Maxime Ripard
2013-07-05 19:34 ` [PATCHv3 06/10] clocksource: sun4i: Fix the next event code Maxime Ripard
2013-07-05 19:34 ` [PATCHv3 07/10] clocksource: sun4i: Factor out some timer code Maxime Ripard
2013-07-05 19:34 ` [PATCHv3 08/10] clocksource: sun4i: Remove TIMER_SCAL variable Maxime Ripard
2013-07-05 20:48   ` Thomas Gleixner
2013-07-05 22:12     ` Maxime Ripard
2013-07-05 19:34 ` [PATCHv3 09/10] clocksource: sun4i: Cleanup parent clock setup Maxime Ripard
2013-07-05 19:34 ` [PATCHv3 10/10] clocksource: sun4i: Fix bug when switching from periodic to oneshot modes Maxime Ripard

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=1373052877-29366-5-git-send-email-maxime.ripard@free-electrons.com \
    --to=maxime.ripard@free-electrons.com \
    --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