diff options
| -rw-r--r-- | chip/ish/hpet.h | 2 | ||||
| -rw-r--r-- | chip/ish/hwtimer.c | 11 | ||||
| -rw-r--r-- | chip/ish/registers.h | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/chip/ish/hpet.h b/chip/ish/hpet.h index dac5d95b9a..086adfaa88 100644 --- a/chip/ish/hpet.h +++ b/chip/ish/hpet.h @@ -33,6 +33,8 @@ #define HPET_T_CONF_CAP_BIT 0x4 #define HPET_ENABLE_CNF (1<<0) +#define HPET_LEGACY_RT_CNF (1<<1) + #define HPET_Tn_INT_TYPE_CNF (1<<1) #define HPET_Tn_INT_ENB_CNF (1<<2) #define HPET_Tn_TYPE_CNF (1<<3) diff --git a/chip/ish/hwtimer.c b/chip/ish/hwtimer.c index 800b728fb7..ed34be583a 100644 --- a/chip/ish/hwtimer.c +++ b/chip/ish/hwtimer.c @@ -98,10 +98,8 @@ int __hw_clock_source_init(uint32_t start_t) timer0_config |= HPET_Tn_32MODE_CNF; timer0_config |= HPET_Tn_VAL_SET_CNF; - /* Timer 0 - IRQ routing */ + /* Timer 0 - IRQ routing, no need IRQ set for HPET0 */ timer0_config &= ~HPET_Tn_INT_ROUTE_CNF_MASK; - timer0_config |= (ISH_HPET_TIMER0_IRQ << - HPET_Tn_INT_ROUTE_CNF_SHIFT); /* Timer 1 - IRQ routing */ timer1_config &= ~HPET_Tn_INT_ROUTE_CNF_MASK; @@ -130,8 +128,11 @@ int __hw_clock_source_init(uint32_t start_t) ; #endif - /* Enable HPET main counter */ - HPET_GENERAL_CONFIG |= HPET_ENABLE_CNF; + /* + * LEGACY_RT_CNF for HPET1 interrupt routing + * and enable overall HPET counter/interrupts. + */ + HPET_GENERAL_CONFIG |= (HPET_ENABLE_CNF | HPET_LEGACY_RT_CNF); return ISH_HPET_TIMER1_IRQ; } diff --git a/chip/ish/registers.h b/chip/ish/registers.h index 32239d3975..056a4676cd 100644 --- a/chip/ish/registers.h +++ b/chip/ish/registers.h @@ -39,8 +39,8 @@ enum ish_i2c_port { /* HW interrupt pins mapped to IOAPIC, from I/O sources */ #define ISH_I2C0_IRQ 0 #define ISH_I2C1_IRQ 1 -#define ISH_HPET_TIMER0_IRQ 22 -#define ISH_HPET_TIMER1_IRQ 23 +#define ISH_HPET_TIMER0_IRQ 55 +#define ISH_HPET_TIMER1_IRQ 8 #define ISH_HPET_TIMER2_IRQ 11 #define ISH_IPC_HOST2ISH_IRQ 12 #define ISH_IPC_ISH2HOST_CLR_IRQ 24 |