summaryrefslogtreecommitdiff
path: root/firmware/target/arm/s5l8700
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm/s5l8700')
-rw-r--r--firmware/target/arm/s5l8700/kernel-s5l8700.c2
-rw-r--r--firmware/target/arm/s5l8700/system-s5l8700.c14
2 files changed, 13 insertions, 3 deletions
diff --git a/firmware/target/arm/s5l8700/kernel-s5l8700.c b/firmware/target/arm/s5l8700/kernel-s5l8700.c
index 6f131d93f8..21b73e466d 100644
--- a/firmware/target/arm/s5l8700/kernel-s5l8700.c
+++ b/firmware/target/arm/s5l8700/kernel-s5l8700.c
@@ -54,6 +54,6 @@ void tick_start(unsigned int interval_in_ms)
TBCMD = (1 << 0); /* TB_EN */
/* enable timer interrupt */
- INTMSK |= (1 << 7);
+ INTMSK |= INTMSK_TIMERB;
}
diff --git a/firmware/target/arm/s5l8700/system-s5l8700.c b/firmware/target/arm/s5l8700/system-s5l8700.c
index 48c50645e9..da1811dc11 100644
--- a/firmware/target/arm/s5l8700/system-s5l8700.c
+++ b/firmware/target/arm/s5l8700/system-s5l8700.c
@@ -66,7 +66,12 @@ default_interrupt(INT_ADC);
static void (* const irqvector[])(void) =
{
- EXT0,EXT1,EXT2,EINT_VBUS,EINTG,INT_TIMERA,INT_WDT,INT_TIMERB,
+ EXT0,EXT1,EXT2,EINT_VBUS,EINTG,
+#if CONFIG_CPU==S5L8701
+ INT_TIMERB,INT_WDT,INT_TIMERA,
+#else
+ INT_TIMERA,INT_WDT,INT_TIMERB,
+#endif
INT_TIMERC,INT_TIMERD,INT_DMA,INT_ALARM_RTC,INT_PRI_RTC,RESERVED1,INT_UART,INT_USB_HOST,
INT_USB_FUNC,INT_LCDC_0,INT_LCDC_1,INT_ECC,INT_CALM,INT_ATA,INT_UART0,INT_SPDIF_OUT,
INT_SDCI,INT_LCD,INT_SPI,INT_IIC,RESERVED2,INT_MSTICK,INT_ADC_WAKEUP,INT_ADC
@@ -74,7 +79,12 @@ static void (* const irqvector[])(void) =
static const char * const irqname[] =
{
- "EXT0","EXT1","EXT2","EINT_VBUS","EINTG","INT_TIMERA","INT_WDT","INT_TIMERB",
+ "EXT0","EXT1","EXT2","EINT_VBUS","EINTG",
+#if CONFIG_CPU==S5L8701
+ "INT_TIMERB","INT_WDT","INT_TIMERA",
+#else
+ "INT_TIMERA","INT_WDT","INT_TIMERB",
+#endif
"INT_TIMERC","INT_TIMERD","INT_DMA","INT_ALARM_RTC","INT_PRI_RTC","Reserved","INT_UART","INT_USB_HOST",
"INT_USB_FUNC","INT_LCDC_0","INT_LCDC_1","INT_ECC","INT_CALM","INT_ATA","INT_UART0","INT_SPDIF_OUT",
"INT_SDCI","INT_LCD","INT_SPI","INT_IIC","Reserved","INT_MSTICK","INT_ADC_WAKEUP","INT_ADC"