diff options
| author | danh-arm <dan.handley@arm.com> | 2015-12-09 10:40:51 +0000 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2015-12-09 10:40:51 +0000 |
| commit | 8d297cc94312c52b5104235fcdc4127ecef6d1af (patch) | |
| tree | 63ebf4f08f84046f99604b015948ad7322f8aa67 /include | |
| parent | f879f002abee2489146da7b1e290339da91bf3aa (diff) | |
| parent | 540a5ba8d955b6f369322b099f70bb5dc6787a06 (diff) | |
Merge pull request #455 from jcastillo-arm/jc/fvp_delay_timer
Fix SP804 delay timer on FVP
Diffstat (limited to 'include')
| -rw-r--r-- | include/drivers/delay_timer.h | 2 | ||||
| -rw-r--r-- | include/plat/arm/board/common/v2m_def.h | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/drivers/delay_timer.h b/include/drivers/delay_timer.h index 4f3bdc88..0dec626c 100644 --- a/include/drivers/delay_timer.h +++ b/include/drivers/delay_timer.h @@ -38,7 +38,7 @@ * The driver must be initialized with a structure that provides a * function pointer to return the timer value and a clock * multiplier/divider. The ratio of the multiplier and the divider is - * the clock frequency in MHz. + * the clock period in microseconds. ********************************************************************/ typedef struct timer_ops { diff --git a/include/plat/arm/board/common/v2m_def.h b/include/plat/arm/board/common/v2m_def.h index 7ed0af6c..888792ed 100644 --- a/include/plat/arm/board/common/v2m_def.h +++ b/include/plat/arm/board/common/v2m_def.h @@ -112,6 +112,13 @@ #define V2M_SP804_TIMER0_BASE 0x1C110000 #define V2M_SP804_TIMER1_BASE 0x1C120000 +/* SP810 controller */ +#define V2M_SP810_BASE 0x1c020000 +#define V2M_SP810_CTRL_TIM0_SEL (1 << 15) +#define V2M_SP810_CTRL_TIM1_SEL (1 << 17) +#define V2M_SP810_CTRL_TIM2_SEL (1 << 19) +#define V2M_SP810_CTRL_TIM3_SEL (1 << 21) + #define V2M_MAP_FLASH0_RW MAP_REGION_FLAT(V2M_FLASH0_BASE,\ V2M_FLASH0_SIZE, \ MT_DEVICE | MT_RW | MT_SECURE) |