diff options
| author | Jaiber John <jaiber.j.john@intel.com> | 2016-10-26 22:23:54 +0530 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-11-04 18:31:30 -0700 |
| commit | a750b1d6b195667606171f4444c660524ecff83e (patch) | |
| tree | ef66b4fb100be2cdb1f9ab5071a54b41002141e1 | |
| parent | d7b938f857755a6a9a7ffbe9f281a14821675a9f (diff) | |
| download | chrome-ec-a750b1d6b195667606171f4444c660524ecff83e.tar.gz | |
minute-ia: Revise macros to be version independent
A few macros that were defined for ISH3.0 were renamed to be generic for
all ISH generations - e.g, ISH30_I2C0_IRQ -> ISH_I2C0_IRQ. Similarly
macros representing base addresses were revised to add ISH_ prefix.
BUG=chrome-os-partner:51851
BRANCH=None
TEST=`make buildall -j`
Change-Id: Idf6657a112b9bd0f73a77f13d02e327c10a9a272
Signed-off-by: Jaiber John <jaiber.j.john@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/403550
Commit-Ready: Raj Mojumder <raj.mojumder@intel.com>
Tested-by: Jaiber J John <jaiber.j.john@intel.com>
Tested-by: Kyoung Il Kim <kyoung.il.kim@intel.com>
Reviewed-by: Jaiber J John <jaiber.j.john@intel.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
| -rw-r--r-- | core/minute-ia/interrupts.c | 12 | ||||
| -rw-r--r-- | core/minute-ia/interrupts.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/minute-ia/interrupts.c b/core/minute-ia/interrupts.c index a64a9f3aab..2c30a9f017 100644 --- a/core/minute-ia/interrupts.c +++ b/core/minute-ia/interrupts.c @@ -67,12 +67,12 @@ void mask_interrupt(uint32_t irq) /* Maps IRQs to vectors. To be programmed in IOAPIC redirection table */ static const irq_desc_t system_irqs[] = { - LEVEL_INTR(ISH30_I2C0_IRQ, ISH30_I2C0_VEC), - LEVEL_INTR(ISH30_I2C1_IRQ, ISH30_I2C1_VEC), - LEVEL_INTR(ISH30_I2C2_IRQ, ISH30_I2C2_VEC), - LEVEL_INTR(ISH30_IPC_HOST2ISH_IRQ, ISH30_IPC_VEC), - LEVEL_INTR(ISH30_HPET_TIMER0_IRQ, ISH30_HPET_TIMER0_VEC), - LEVEL_INTR(ISH30_HPET_TIMER1_IRQ, ISH30_HPET_TIMER1_VEC), + LEVEL_INTR(ISH_I2C0_IRQ, ISH_I2C0_VEC), + LEVEL_INTR(ISH_I2C1_IRQ, ISH_I2C1_VEC), + LEVEL_INTR(ISH_I2C2_IRQ, ISH_I2C2_VEC), + LEVEL_INTR(ISH_IPC_HOST2ISH_IRQ, ISH_IPC_VEC), + LEVEL_INTR(ISH_HPET_TIMER0_IRQ, ISH_HPET_TIMER0_VEC), + LEVEL_INTR(ISH_HPET_TIMER1_IRQ, ISH_HPET_TIMER1_VEC), }; diff --git a/core/minute-ia/interrupts.h b/core/minute-ia/interrupts.h index 7bc6944fcc..c878a90968 100644 --- a/core/minute-ia/interrupts.h +++ b/core/minute-ia/interrupts.h @@ -48,8 +48,8 @@ typedef struct { /* APIC bit definitions. */ #define APIC_DIV_16 0x03 #define APIC_ENABLE_BIT (1UL << 8UL) -#define APIC_SPURIOUS_INT REG32(LAPIC_BASE + 0xF0UL ) -#define APIC_LVT_ERROR REG32(LAPIC_BASE + 0x370UL) +#define APIC_SPURIOUS_INT REG32(ISH_LAPIC_BASE + 0xF0UL ) +#define APIC_LVT_ERROR REG32(ISH_LAPIC_BASE + 0x370UL) #ifndef __ASSEMBLER__ /* Interrupt descriptor entry */ |