diff options
-rw-r--r-- | arch/arm/mach-netx/time.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c index 7c540c1f01fa..be833bd1048e 100644 --- a/arch/arm/mach-netx/time.c +++ b/arch/arm/mach-netx/time.c | |||
@@ -42,9 +42,9 @@ netx_timer_interrupt(int irq, void *dev_id) | |||
42 | } | 42 | } |
43 | 43 | ||
44 | static struct irqaction netx_timer_irq = { | 44 | static struct irqaction netx_timer_irq = { |
45 | .name = "NetX Timer Tick", | 45 | .name = "NetX Timer Tick", |
46 | .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, | 46 | .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, |
47 | .handler = netx_timer_interrupt, | 47 | .handler = netx_timer_interrupt, |
48 | }; | 48 | }; |
49 | 49 | ||
50 | cycle_t netx_get_cycles(void) | 50 | cycle_t netx_get_cycles(void) |
@@ -53,11 +53,11 @@ cycle_t netx_get_cycles(void) | |||
53 | } | 53 | } |
54 | 54 | ||
55 | static struct clocksource clocksource_netx = { | 55 | static struct clocksource clocksource_netx = { |
56 | .name = "netx_timer", | 56 | .name = "netx_timer", |
57 | .rating = 200, | 57 | .rating = 200, |
58 | .read = netx_get_cycles, | 58 | .read = netx_get_cycles, |
59 | .mask = CLOCKSOURCE_MASK(32), | 59 | .mask = CLOCKSOURCE_MASK(32), |
60 | .shift = 20, | 60 | .shift = 20, |
61 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 61 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
62 | }; | 62 | }; |
63 | 63 | ||
@@ -77,20 +77,22 @@ static void __init netx_timer_init(void) | |||
77 | /* acknowledge interrupt */ | 77 | /* acknowledge interrupt */ |
78 | writel(COUNTER_BIT(0), NETX_GPIO_IRQ); | 78 | writel(COUNTER_BIT(0), NETX_GPIO_IRQ); |
79 | 79 | ||
80 | /* Enable the interrupt in the specific timer register and start timer */ | 80 | /* Enable the interrupt in the specific timer |
81 | * register and start timer | ||
82 | */ | ||
81 | writel(COUNTER_BIT(0), NETX_GPIO_IRQ_ENABLE); | 83 | writel(COUNTER_BIT(0), NETX_GPIO_IRQ_ENABLE); |
82 | writel(NETX_GPIO_COUNTER_CTRL_IRQ_EN | NETX_GPIO_COUNTER_CTRL_RUN, | 84 | writel(NETX_GPIO_COUNTER_CTRL_IRQ_EN | NETX_GPIO_COUNTER_CTRL_RUN, |
83 | NETX_GPIO_COUNTER_CTRL(0)); | 85 | NETX_GPIO_COUNTER_CTRL(0)); |
84 | 86 | ||
85 | setup_irq(NETX_IRQ_TIMER0, &netx_timer_irq); | 87 | setup_irq(NETX_IRQ_TIMER0, &netx_timer_irq); |
86 | 88 | ||
87 | /* Setup timer one for clocksource */ | 89 | /* Setup timer one for clocksource */ |
88 | writel(0, NETX_GPIO_COUNTER_CTRL(1)); | 90 | writel(0, NETX_GPIO_COUNTER_CTRL(1)); |
89 | writel(0, NETX_GPIO_COUNTER_CURRENT(1)); | 91 | writel(0, NETX_GPIO_COUNTER_CURRENT(1)); |
90 | writel(0xFFFFFFFF, NETX_GPIO_COUNTER_MAX(1)); | 92 | writel(0xffffffff, NETX_GPIO_COUNTER_MAX(1)); |
91 | 93 | ||
92 | writel(NETX_GPIO_COUNTER_CTRL_RUN, | 94 | writel(NETX_GPIO_COUNTER_CTRL_RUN, |
93 | NETX_GPIO_COUNTER_CTRL(1)); | 95 | NETX_GPIO_COUNTER_CTRL(1)); |
94 | 96 | ||
95 | clocksource_netx.mult = | 97 | clocksource_netx.mult = |
96 | clocksource_hz2mult(CLOCK_TICK_RATE, clocksource_netx.shift); | 98 | clocksource_hz2mult(CLOCK_TICK_RATE, clocksource_netx.shift); |