Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753149Ab3FZVRN (ORCPT ); Wed, 26 Jun 2013 17:17:13 -0400 Received: from mail.free-electrons.com ([94.23.35.102]:51810 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753058Ab3FZVRF (ORCPT ); Wed, 26 Jun 2013 17:17:05 -0400 From: Maxime Ripard To: John Stultz , Thomas Gleixner Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Emilio Lopez , kevin@allwinnertech.com, sunny@allwinnertech.com, shuge@allwinnertech.com, linux-sunxi@googlegroups.com, Maxime Ripard Subject: [PATCH 2/8] clocksource: sun4i: Add clocksource and sched clock drivers Date: Wed, 26 Jun 2013 23:16:55 +0200 Message-Id: <1372281421-2099-3-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1372281421-2099-1-git-send-email-maxime.ripard@free-electrons.com> References: <1372281421-2099-1-git-send-email-maxime.ripard@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2368 Lines: 76 The A10 and the A13 has a 64 bits free running counter that we can use as a clocksource and a sched clock, that were both not used yet on these platforms. Signed-off-by: Maxime Ripard --- drivers/clocksource/sun4i_timer.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c index bdf34d9..1d2eaa0 100644 --- a/drivers/clocksource/sun4i_timer.c +++ b/drivers/clocksource/sun4i_timer.c @@ -23,6 +23,8 @@ #include #include +#include + #define TIMER_IRQ_EN_REG 0x00 #define TIMER_IRQ_EN(val) BIT(val) #define TIMER_IRQ_ST_REG 0x04 @@ -34,6 +36,11 @@ #define TIMER_CNTVAL_REG(val) (0x10 * val + 0x18) #define TIMER_SCAL 16 +#define TIMER_CNT64_CTL_REG 0xa0 +#define TIMER_CNT64_CTL_CLR BIT(0) +#define TIMER_CNT64_CTL_RL BIT(1) +#define TIMER_CNT64_LOW_REG 0xa4 +#define TIMER_CNT64_HIGH_REG 0xa8 static void __iomem *timer_base; @@ -96,6 +103,20 @@ static struct irqaction sun4i_timer_irq = { .dev_id = &sun4i_clockevent, }; +static u32 sun4i_timer_sched_read(void) +{ + u32 reg = readl(timer_base + TIMER_CNT64_CTL_REG); + writel(reg | TIMER_CNT64_CTL_RL, timer_base + TIMER_CNT64_CTL_REG); + while (readl(timer_base + TIMER_CNT64_CTL_REG) & TIMER_CNT64_CTL_REG); + + return readl(timer_base + TIMER_CNT64_LOW_REG); +} + +static cycle_t sun4i_timer_clksrc_read(struct clocksource *c) +{ + return sun4i_timer_sched_read(); +} + static void __init sun4i_timer_init(struct device_node *node) { unsigned long rate = 0; @@ -117,6 +138,12 @@ static void __init sun4i_timer_init(struct device_node *node) rate = clk_get_rate(clk); + writel(TIMER_CNT64_CTL_CLR, timer_base + TIMER_CNT64_CTL_REG); + setup_sched_clock(sun4i_timer_sched_read, 32, clk_get_rate(clk)); + clocksource_mmio_init(timer_base + TIMER_CNT64_LOW_REG, node->name, + clk_get_rate(clk), 300, 32, + sun4i_timer_clksrc_read); + writel(rate / (TIMER_SCAL * HZ), timer_base + TIMER_INTVAL_REG(0)); -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/