Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 296168
b: refs/heads/master
c: 9e1c0b2
h: refs/heads/master
v: v3
  • Loading branch information
Nicolas Ferre committed Feb 23, 2012
1 parent e369ef6 commit aad8cb5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5e9cf5e18d4bed39467cc020dcd3e66e8a8cd231
refs/heads/master: 9e1c0b2ee8ae69dd4b35187ffbfb749272db3e00
6 changes: 3 additions & 3 deletions trunk/arch/arm/mach-at91/at91rm9200_time.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ clkevt32k_mode(enum clock_event_mode mode, struct clock_event_device *dev)
{
/* Disable and flush pending timer interrupts */
at91_st_write(AT91_ST_IDR, AT91_ST_PITS | AT91_ST_ALMS);
(void) at91_st_read(AT91_ST_SR);
at91_st_read(AT91_ST_SR);

last_crtr = read_CRTR();
switch (mode) {
Expand Down Expand Up @@ -157,7 +157,7 @@ clkevt32k_next_event(unsigned long delta, struct clock_event_device *dev)

/* Cancel any pending alarm; flush any pending IRQ */
at91_st_write(AT91_ST_RTAR, alm);
(void) at91_st_read(AT91_ST_SR);
at91_st_read(AT91_ST_SR);

/* Schedule alarm by writing RTAR. */
alm += delta;
Expand Down Expand Up @@ -192,7 +192,7 @@ void __init at91rm9200_timer_init(void)
/* Disable all timer interrupts, and clear any pending ones */
at91_st_write(AT91_ST_IDR,
AT91_ST_PITS | AT91_ST_WDOVF | AT91_ST_RTTINC | AT91_ST_ALMS);
(void) at91_st_read(AT91_ST_SR);
at91_st_read(AT91_ST_SR);

/* Make IRQs happen for the system timer */
setup_irq(AT91_ID_SYS, &at91rm9200_timer_irq);
Expand Down

0 comments on commit aad8cb5

Please sign in to comment.