d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the passing of time on Armada XP.

Browse Source 
In order to become independent of Coherency Fabric frequency, configure
Timer and Watchdog to operate in 25MHz mode.

Submitted by:	Zbigniew Bodek <zbb@semihalf.com>
This commit is contained in:
Grzegorz Bernacki 2013-06-04 09:33:03 +00:00
parent df8c5665ac
commit 046b51bfdd
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arm/mv/mvreg.h
View File

@ -215,6 +215,10 @@
#define CPU_TIMER1_AUTO 0x00000008 #define CPU_TIMER1_AUTO 0x00000008
#define CPU_TIMER_WD_EN 0x00000010 #define CPU_TIMER_WD_EN 0x00000010
#define CPU_TIMER_WD_AUTO 0x00000020 #define CPU_TIMER_WD_AUTO 0x00000020
/* 25MHz mode is Armada XP - specific */
#define CPU_TIMER_WD_25MHZ_EN 0x00000400
#define CPU_TIMER0_25MHZ_EN 0x00000800
#define CPU_TIMER1_25MHZ_EN 0x00001000
#define CPU_TIMER0_REL 0x10 #define CPU_TIMER0_REL 0x10
#define CPU_TIMER0 0x14 #define CPU_TIMER0 0x14

9
sys/arm/mv/timer.c
View File

@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
#define MAX_WATCHDOG_TICKS (0xffffffff) #define MAX_WATCHDOG_TICKS (0xffffffff)
#if defined(SOC_MV_ARMADAXP) #if defined(SOC_MV_ARMADAXP)
#define MV_CLOCK_SRC get_l2clk() #define MV_CLOCK_SRC 25000000 /* Timers' 25MHz mode */
#else #else
#define MV_CLOCK_SRC get_tclk() #define MV_CLOCK_SRC get_tclk()
#endif #endif
@ -323,6 +323,9 @@ mv_watchdog_enable(void)
val = mv_get_timer_control(); val = mv_get_timer_control();
val |= CPU_TIMER_WD_EN | CPU_TIMER_WD_AUTO; val |= CPU_TIMER_WD_EN | CPU_TIMER_WD_AUTO;
#if defined(SOC_MV_ARMADAXP)
val |= CPU_TIMER_WD_25MHZ_EN;
#endif
mv_set_timer_control(val); mv_set_timer_control(val);
} }
@ -440,6 +443,10 @@ mv_setup_timers(void)
val = mv_get_timer_control(); val = mv_get_timer_control();
val &= ~(CPU_TIMER0_EN | CPU_TIMER0_AUTO); val &= ~(CPU_TIMER0_EN | CPU_TIMER0_AUTO);
val |= CPU_TIMER1_EN | CPU_TIMER1_AUTO; val |= CPU_TIMER1_EN | CPU_TIMER1_AUTO;
#if defined(SOC_MV_ARMADAXP)
/* Enable 25MHz mode */
val |= CPU_TIMER0_25MHZ_EN | CPU_TIMER1_25MHZ_EN;
#endif
mv_set_timer_control(val); mv_set_timer_control(val);
timers_initialized = 1; timers_initialized = 1;
} }