mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: John Stultz <john.stultz@linaro.org>,
	Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, Emilio Lopez <emilio@elopez.com.ar>,
	kevin@allwinnertech.com, sunny@allwinnertech.com,
	shuge@allwinnertech.com, linux-sunxi@googlegroups.com,
	Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: [PATCHv2 2/8] clocksource: sun4i: Add clocksource and sched clock drivers
Date: Fri, 28 Jun 2013 21:56:20 +0200	[thread overview]
Message-ID: <1372449386-1334-3-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1372449386-1334-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 | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c
index bdf34d9..050e94f 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>
@@ -33,8 +34,6 @@
 #define TIMER_INTVAL_REG(val)	(0x10 * val + 0x14)
 #define TIMER_CNTVAL_REG(val)	(0x10 * val + 0x18)
 
-#define TIMER_SCAL		16
-
 static void __iomem *timer_base;
 
 static void sun4i_clkevt_mode(enum clock_event_mode mode,
@@ -96,6 +95,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;
@@ -143,6 +147,15 @@ static void __init sun4i_timer_init(struct device_node *node)
 
 	clockevents_config_and_register(&sun4i_clockevent, rate / TIMER_SCAL,
 					0x1, 0xff);
+
+	writel(~0, timer_base + TIMER_INTVAL_REG(1));
+	writel(TIMER_CTL_ENABLE | TIMER_CTL_AUTORELOAD | 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);
 }
 CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-timer",
 		       sun4i_timer_init);
-- 
1.8.3.1


  parent reply	other threads:[~2013-06-28 19:56 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-28 19:56 [PATCHv2 0/8] clocksource: sunxi: Timer fixes and cleanup Maxime Ripard
2013-06-28 19:56 ` [PATCHv2 1/8] clocksource: sun4i: Use the BIT macros where possible Maxime Ripard
2013-06-28 19:56 ` Maxime Ripard [this message]
2013-06-28 19:56 ` [PATCHv2 3/8] clocksource: sun4i: Don't forget to enable the clock we use Maxime Ripard
2013-06-28 19:56 ` [PATCHv2 4/8] clocksource: sun4i: Fix the next event code Maxime Ripard
2013-06-28 20:13   ` Thomas Gleixner
2013-06-28 20:35     ` Tomasz Figa
2013-06-28 21:20       ` Maxime Ripard
2013-06-28 21:08     ` Maxime Ripard
2013-06-28 21:27       ` Thomas Gleixner
2013-06-29  6:48         ` Maxime Ripard
2013-07-01  8:15           ` Thomas Gleixner
2013-06-28 19:56 ` [PATCHv2 5/8] clocksource: sun4i: Factor out some timer code Maxime Ripard
2013-06-28 19:56 ` [PATCHv2 6/8] clocksource: sun4i: Remove TIMER_SCAL variable Maxime Ripard
2013-06-28 19:56 ` [PATCHv2 7/8] clocksource: sun4i: Cleanup parent clock setup Maxime Ripard
2013-06-28 19:56 ` [PATCHv2 8/8] 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=1372449386-1334-3-git-send-email-maxime.ripard@free-electrons.com \
    --to=maxime.ripard@free-electrons.com \
    --cc=emilio@elopez.com.ar \
    --cc=john.stultz@linaro.org \
    --cc=kevin@allwinnertech.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sunxi@googlegroups.com \
    --cc=shuge@allwinnertech.com \
    --cc=sunny@allwinnertech.com \
    --cc=tglx@linutronix.de \
    /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

all inboxes | Powered by JetHome®