lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: clps711x: convert to clockevents

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

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Alexander Shiyan 2012-10-10 19:45:27 +04:00 committed by Arnd Bergmann
parent ddffeb8c4d
commit 4a8355c4c3
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/Kconfig
View File

@ -364,10 +364,10 @@ config ARCH_CNS3XXX
config ARCH_CLPS711X config ARCH_CLPS711X
bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
select ARCH_USES_GETTIMEOFFSET
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select COMMON_CLK select COMMON_CLK
select CPU_ARM720T select CPU_ARM720T
select GENERIC_CLOCKEVENTS
select NEED_MACH_MEMORY_H select NEED_MACH_MEMORY_H
help help
Support for Cirrus Logic 711x/721x/731x based boards. Support for Cirrus Logic 711x/721x/731x based boards.

38
arch/arm/mach-clps711x/common.c
View File

@ -21,13 +21,14 @@
*/ */
#include <linux/io.h> #include <linux/io.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/sizes.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/clkdev.h> #include <linux/clkdev.h>
#include <linux/clockchips.h>
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include <asm/sizes.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/system_misc.h> #include <asm/system_misc.h>
@ -36,7 +37,6 @@
static struct clk *clk_pll, *clk_bus, *clk_uart, *clk_timerl, *clk_timerh, static struct clk *clk_pll, *clk_bus, *clk_uart, *clk_timerl, *clk_timerh,
*clk_tint, *clk_spi; *clk_tint, *clk_spi;
static unsigned long latch;
/* /*
* This maps the generic CLPS711x registers * This maps the generic CLPS711x registers
@ -158,32 +158,29 @@ void __init clps711x_init_irq(void)
clps_writel(0, KBDEOI); clps_writel(0, KBDEOI);
} }
/* static void clps711x_clockevent_set_mode(enum clock_event_mode mode,
* gettimeoffset() returns time since last timer tick, in usecs. struct clock_event_device *evt)
*
* 'LATCH' is hwclock ticks (see CLOCK_TICK_RATE in timex.h) per jiffy.
* 'tick' is usecs per jiffy.
*/
static unsigned long clps711x_gettimeoffset(void)
{ {
unsigned long hwticks;
hwticks = latch - (clps_readl(TC2D) & 0xffff);
return (hwticks * (tick_nsec / 1000)) / latch;
} }
/* static struct clock_event_device clockevent_clps711x = {
* IRQ handler for the timer .name = "CLPS711x Clockevents",
*/ .rating = 300,
static irqreturn_t p720t_timer_interrupt(int irq, void *dev_id) .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; return IRQ_HANDLED;
} }
static struct irqaction clps711x_timer_irq = { static struct irqaction clps711x_timer_irq = {
.name = "CLPS711x Timer Tick", .name = "CLPS711x Timer Tick",
.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, .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) 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); 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 = clps_readl(SYSCON1);
tmp |= SYSCON1_TC2S | SYSCON1_TC2M; tmp |= SYSCON1_TC2S | SYSCON1_TC2M;
clps_writel(tmp, SYSCON1); 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); setup_irq(IRQ_TC2OI, &clps711x_timer_irq);
} }
struct sys_timer clps711x_timer = { struct sys_timer clps711x_timer = {
.init = clps711x_timer_init, .init = clps711x_timer_init,
.offset = clps711x_gettimeoffset,
}; };
void clps711x_restart(char mode, const char *cmd) void clps711x_restart(char mode, const char *cmd)