OMAP: use {read, write}l to access timer registers
PATCH 3/3 OMAP: use {read, write}l to access timer registers
Signed-off-by Ladislav Michl <[email protected]>
--- cpu/arm925t/interrupts.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-)
cpu/arm925t/interrupts.c +9 -12
@@ -35,24 +35,21 @@#include <common.h> #include <arm925t.h> #include <configs/omap1510.h> +#include <asm/io.h> #define TIMER_LOAD_VAL 0xffffffff -/* macro to read the 32 bit timer */ -#define READ_TIMER (*(volatile ulong *)(CONFIG_SYS_TIMERBASE+8)) - -static ulong timestamp; -static ulong lastdec; +static uint32_t timestamp; +static uint32_t lastdec;/* nothing really to do with interrupts, just starts up a counter. */ int interrupt_init (void ) { -int32_t val; -/* Start the decrementer ticking down from 0xffffffff */ - *((int32_t *) (CONFIG_SYS_TIMERBASE +LOAD_TIM )) =TIMER_LOAD_VAL ; - val =MPUTIM_ST |MPUTIM_AR |MPUTIM_CLOCK_ENABLE | (CONFIG_SYS_PTV <<MPUTIM_PTV_BIT ); - *((int32_t *) (CONFIG_SYS_TIMERBASE +CNTL_TIMER )) = val; +__raw_writel (TIMER_LOAD_VAL ,CONFIG_SYS_TIMERBASE +LOAD_TIM ); +__raw_writel (MPUTIM_ST |MPUTIM_AR |MPUTIM_CLOCK_ENABLE | + (CONFIG_SYS_PTV <<MPUTIM_PTV_BIT ), +CONFIG_SYS_TIMERBASE +CNTL_TIMER );/* init the timestamp and lastdec value */ reset_timer_masked ();
@@ -106,13 +103,13 @@ void udelay (unsigned long usec)void reset_timer_masked (void ) {/* reset time */ - lastdec =READ_TIMER ;/* capure current decrementer value time */ + lastdec =__raw_readl (CONFIG_SYS_TIMERBASE +READ_TIM ); timestamp =0 ;/* start "advancing" time stamp from 0 */ }ulong get_timer_masked (void ) { -ulong now =READ_TIMER ;/* current tick value */ +uint32_t now =__raw_readl (CONFIG_SYS_TIMERBASE +READ_TIM );if (lastdec >= now) {/* normal mode (non roll) */ /* normal mode */
Signature · 1 line
1.5.3.8
Jean-Christophe PLAGNIOL-VILLARD
AppliedPATCH 3/3 OMAP: use {read, write}l to access timer registers
Quoted 2 lines · Ladislav Michl
Signed-off-by Ladislav Michl <[email protected]>
applied
Best Regards,
J.