[1/7] ARM: clps711x: convert to clockevents

Commit Message

Alexander Shiyan Oct. 10, 2012, 3:45 p.m. UTC

This patch converts CLPS711X-platform to use modern clockevent API.

Signed-off-by: Alexander Shiyan <[e-mail]>
---
 arch/arm/Kconfig                |    2 +-
 arch/arm/mach-clps711x/common.c |   38 +++++++++++++++++---------------------
 2 files changed, 18 insertions(+), 22 deletions(-)

Comments

Arnd Bergmann Oct. 10, 2012, 6:30 p.m. UTC | #1

On Wednesday 10 October 2012, Alexander Shiyan wrote:
> This patch converts CLPS711X-platform to use modern clockevent API.
> 
> Signed-off-by: Alexander Shiyan <[e-mail]>
> ---
>  arch/arm/Kconfig                |    2 +-
>  arch/arm/mach-clps711x/common.c |   38 +++++++++++++++++---------------------
>  2 files changed, 18 insertions(+), 22 deletions(-)

Overall a very nice series, all 7 patches. I just have a few trivial
comments for patch 5.

	Arnd

Arnd Bergmann Oct. 25, 2012, 3:30 p.m. UTC | #2

On Wednesday 10 October 2012, Alexander Shiyan wrote:
> This patch converts CLPS711X-platform to use modern clockevent API.
> 
> Signed-off-by: Alexander Shiyan <[e-mail]>

Applied the entire series. There are a few things that you can do
to simplify the process so you don't have to remind us to pull in
patches you send:

* Use 'git format-patch --cover-letter' to create an introductory
email, and in that mail, ask us specifically to pull it into arm-soc
of that is the idea, or to just do a review for the first version.

* Send one patch to add yourself to the maintainers file. You are
the only person who is sending patches for clps711x at the moment,
and we don't have a formal maintainer besides you, so I think you
should do it officially.

* If possible, provide a git URL to pull from directly, and use
a signed tag to describe the series overall. Use "git request-pull"
to send the email asking for your changes to be pulled in.

The patches from this set are now in the clps711x/soc branch,
merged into the next/soc branch that will be sent in the 3.8
merge window and they are part of the for-next branch to get
testing in the linux-next kernel.

	Arnd

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3ebe71c..1d43127 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -354,9 +354,9 @@  config ARCH_BCM2835
 config ARCH_CLPS711X
 	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
 	select CPU_ARM720T
-	select ARCH_USES_GETTIMEOFFSET
 	select COMMON_CLK
 	select CLKDEV_LOOKUP
+	select GENERIC_CLOCKEVENTS
 	select NEED_MACH_MEMORY_H
 	help
 	  Support for Cirrus Logic 711x/721x/731x based boards.
diff --git a/arch/arm/mach-clps711x/common.c b/arch/arm/mach-clps711x/common.c
index 509243d..218684f 100644
--- a/arch/arm/mach-clps711x/common.c
+++ b/arch/arm/mach-clps711x/common.c
@@ -21,13 +21,14 @@ 
  */
 #include <linux/io.h>
 #include <linux/init.h>
+#include <linux/sizes.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/clk.h>
 #include <linux/clkdev.h>
+#include <linux/clockchips.h>
 #include <linux/clk-provider.h>
 
-#include <asm/sizes.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
 #include <asm/system_misc.h>
@@ -36,7 +37,6 @@ 
 
 static struct clk *clk_pll, *clk_bus, *clk_uart, *clk_timerl, *clk_timerh,
 		  *clk_tint, *clk_spi;
-static unsigned long latch;
 
 /*
  * This maps the generic CLPS711x registers
@@ -158,32 +158,29 @@  void __init clps711x_init_irq(void)
 	clps_writel(0, KBDEOI);
 }
 
-/*
- * gettimeoffset() returns time since last timer tick, in usecs.
- *
- * 'LATCH' is hwclock ticks (see CLOCK_TICK_RATE in timex.h) per jiffy.
- * 'tick' is usecs per jiffy.
- */
-static unsigned long clps711x_gettimeoffset(void)
+static void clps711x_clockevent_set_mode(enum clock_event_mode mode,
+					 struct clock_event_device *evt)
 {
-	unsigned long hwticks;
-	hwticks = latch - (clps_readl(TC2D) & 0xffff);
-	return (hwticks * (tick_nsec / 1000)) / latch;
 }
 
-/*
- * IRQ handler for the timer
- */
-static irqreturn_t p720t_timer_interrupt(int irq, void *dev_id)
+static struct clock_event_device clockevent_clps711x = {
+	.name		= "CLPS711x Clockevents",
+	.rating		= 300,
+	.features	= CLOCK_EVT_FEAT_PERIODIC,
+	.set_mode	= clps711x_clockevent_set_mode,
+};
+
+static irqreturn_t clps711x_timer_interrupt(int irq, void *dev_id)
 {
-	timer_tick();
+	clockevent_clps711x.event_handler(&clockevent_clps711x);
+
 	return IRQ_HANDLED;
 }
 
 static struct irqaction clps711x_timer_irq = {
 	.name		= "CLPS711x Timer Tick",
 	.flags		= IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
-	.handler	= p720t_timer_interrupt,
+	.handler	= clps711x_timer_interrupt,
 };
 
 static void add_fixed_clk(struct clk *clk, const char *name, int rate)
@@ -244,20 +241,19 @@  static void __init clps711x_timer_init(void)
 
 	pr_info("CPU frequency set at %i Hz.\n", cpu);
 
-	latch = (timh + HZ / 2) / HZ;
+	clps_writew(DIV_ROUND_CLOSEST(timh, HZ), TC2D);
 
 	tmp = clps_readl(SYSCON1);
 	tmp |= SYSCON1_TC2S | SYSCON1_TC2M;
 	clps_writel(tmp, SYSCON1);
 
-	clps_writel(latch - 1, TC2D);
+	clockevents_config_and_register(&clockevent_clps711x, timh, 1, 0xffff);
 
 	setup_irq(IRQ_TC2OI, &clps711x_timer_irq);
 }
 
 struct sys_timer clps711x_timer = {
 	.init		= clps711x_timer_init,
-	.offset		= clps711x_gettimeoffset,
 };
 
 void clps711x_restart(char mode, const char *cmd)