diff options
Diffstat (limited to 'chip/ish/hpet.h')
-rw-r--r-- | chip/ish/hpet.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/chip/ish/hpet.h b/chip/ish/hpet.h index 086adfaa88..0ad374350e 100644 --- a/chip/ish/hpet.h +++ b/chip/ish/hpet.h @@ -45,14 +45,24 @@ #define HPET_Tn_INT_ROUTE_CNF_MASK (0x1f << 9) #define HPET_GENERAL_CONFIG REG32(ISH_HPET_BASE + GENERAL_CONFIG_REG) +#if defined CONFIG_ISH_30 +#define HPET_MAIN_COUNTER_64 REG64(ISH_HPET_BASE + MAIN_COUNTER_REG) +#else #define HPET_MAIN_COUNTER REG32(ISH_HPET_BASE + MAIN_COUNTER_REG) +#endif #define HPET_INTR_CLEAR REG32(ISH_HPET_BASE + GENERAL_INT_STAT_REG) #define HPET_CTRL_STATUS REG32(ISH_HPET_BASE + CONTROL_AND_STATUS_REG) #define HPET_TIMER_CONF_CAP(x) \ - REG32(ISH_HPET_BASE + TIMER0_CONF_CAP_REG + (x * 0x20)) + REG32(ISH_HPET_BASE + TIMER0_CONF_CAP_REG + ((x) * 0x20)) +/* HPET1/2 are 32 bit only. HPET0 is 32bit/64bit from configuration register + * HPET_TIMER_CONFIG_CAP(0) */ #define HPET_TIMER_COMP(x) \ - REG32(ISH_HPET_BASE + TIMER0_COMP_VAL_REG + (x * 0x20)) + REG32(ISH_HPET_BASE + TIMER0_COMP_VAL_REG + ((x) * 0x20)) +#if defined CONFIG_ISH_30 +#define HPET_TIMER_COMP_64(x) \ + REG64(ISH_HPET_BASE + TIMER0_COMP_VAL_REG + ((x) * 0x20)) +#endif #if defined CONFIG_ISH_20 #define ISH_HPET_CLK_FREQ 1000000 /* 1 MHz clock */ |