1 files changed, 2 insertions, 120 deletions

diff --git a/firmware/target/arm/imx233/system-imx233.c b/firmware/target/arm/imx233/system-imx233.c
index 51eb099709..a06ecab9f5 100644
--- a/firmware/target/arm/imx233/system-imx233.c
+++ b/firmware/target/arm/imx233/system-imx233.c
@@ -31,6 +31,7 @@
 #include "ssp-imx233.h"
 #include "i2c-imx233.h"
 #include "dcp-imx233.h"
+#include "icoll-imx233.h"
 #include "lradc-imx233.h"
 #include "rtc-imx233.h"
 #include "lcd.h"
@@ -38,98 +39,6 @@
 #include "button.h"
 #include "fmradio_i2c.h"
 
-#define default_interrupt(name) \
-    extern __attribute__((weak, alias("UIRQ"))) void name(void)
-
-static void UIRQ (void) __attribute__((interrupt ("IRQ")));
-void irq_handler(void) __attribute__((interrupt("IRQ")));
-void fiq_handler(void) __attribute__((interrupt("FIQ")));
-
-default_interrupt(INT_USB_CTRL);
-default_interrupt(INT_TIMER0);
-default_interrupt(INT_TIMER1);
-default_interrupt(INT_TIMER2);
-default_interrupt(INT_TIMER3);
-default_interrupt(INT_LCDIF_DMA);
-default_interrupt(INT_LCDIF_ERROR);
-default_interrupt(INT_SSP1_DMA);
-default_interrupt(INT_SSP1_ERROR);
-default_interrupt(INT_SSP2_DMA);
-default_interrupt(INT_SSP2_ERROR);
-default_interrupt(INT_I2C_DMA);
-default_interrupt(INT_I2C_ERROR);
-default_interrupt(INT_GPIO0);
-default_interrupt(INT_GPIO1);
-default_interrupt(INT_GPIO2);
-default_interrupt(INT_VDD5V);
-default_interrupt(INT_LRADC_CH0);
-default_interrupt(INT_LRADC_CH1);
-default_interrupt(INT_LRADC_CH2);
-default_interrupt(INT_LRADC_CH3);
-default_interrupt(INT_LRADC_CH4);
-default_interrupt(INT_LRADC_CH5);
-default_interrupt(INT_LRADC_CH6);
-default_interrupt(INT_LRADC_CH7);
-default_interrupt(INT_DAC_DMA);
-default_interrupt(INT_DAC_ERROR);
-default_interrupt(INT_ADC_DMA);
-default_interrupt(INT_ADC_ERROR);
-default_interrupt(INT_DCP);
-
-typedef void (*isr_t)(void);
-
-static isr_t isr_table[INT_SRC_NR_SOURCES] =
-{
-    [INT_SRC_USB_CTRL] = INT_USB_CTRL,
-    [INT_SRC_TIMER(0)] = INT_TIMER0,
-    [INT_SRC_TIMER(1)] = INT_TIMER1,
-    [INT_SRC_TIMER(2)] = INT_TIMER2,
-    [INT_SRC_TIMER(3)] = INT_TIMER3,
-    [INT_SRC_LCDIF_DMA] = INT_LCDIF_DMA,
-    [INT_SRC_LCDIF_ERROR] = INT_LCDIF_ERROR,
-    [INT_SRC_SSP1_DMA] = INT_SSP1_DMA,
-    [INT_SRC_SSP1_ERROR] = INT_SSP1_ERROR,
-    [INT_SRC_SSP2_DMA] = INT_SSP2_DMA,
-    [INT_SRC_SSP2_ERROR] = INT_SSP2_ERROR,
-    [INT_SRC_I2C_DMA] = INT_I2C_DMA,
-    [INT_SRC_I2C_ERROR] = INT_I2C_ERROR,
-    [INT_SRC_GPIO0] = INT_GPIO0,
-    [INT_SRC_GPIO1] = INT_GPIO1,
-    [INT_SRC_GPIO2] = INT_GPIO2,
-    [INT_SRC_VDD5V] = INT_VDD5V,
-    [INT_SRC_LRADC_CHx(0)] = INT_LRADC_CH0,
-    [INT_SRC_LRADC_CHx(1)] = INT_LRADC_CH1,
-    [INT_SRC_LRADC_CHx(2)] = INT_LRADC_CH2,
-    [INT_SRC_LRADC_CHx(3)] = INT_LRADC_CH3,
-    [INT_SRC_LRADC_CHx(4)] = INT_LRADC_CH4,
-    [INT_SRC_LRADC_CHx(5)] = INT_LRADC_CH5,
-    [INT_SRC_LRADC_CHx(6)] = INT_LRADC_CH6,
-    [INT_SRC_LRADC_CHx(7)] = INT_LRADC_CH7,
-    [INT_SRC_DAC_DMA] = INT_DAC_DMA,
-    [INT_SRC_DAC_ERROR] = INT_DAC_ERROR,
-    [INT_SRC_ADC_DMA] = INT_ADC_DMA,
-    [INT_SRC_ADC_ERROR] = INT_ADC_ERROR,
-    [INT_SRC_DCP] = INT_DCP,
-};
-
-static void UIRQ(void)
-{
-    panicf("Unhandled IRQ %02X",
-        (unsigned int)(HW_ICOLL_VECTOR - (uint32_t)isr_table) / 4);
-}
-
-void irq_handler(void)
-{
-    HW_ICOLL_VECTOR = HW_ICOLL_VECTOR; /* notify icoll that we entered ISR */
-    (*(isr_t *)HW_ICOLL_VECTOR)();
-    /* acknowledge completion of IRQ (all use the same priority 0) */
-    HW_ICOLL_LEVELACK = HW_ICOLL_LEVELACK__LEVEL0;
-}
-
-void fiq_handler(void)
-{
-}
-
 void imx233_chip_reset(void)
 {
     HW_CLKCTRL_RESET = HW_CLKCTRL_RESET_CHIP;
@@ -164,22 +73,6 @@ int system_memory_guard(int newmode)
     return 0;
 }
 
-void imx233_enable_interrupt(int src, bool enable)
-{
-    if(enable)
-        __REG_SET(HW_ICOLL_INTERRUPT(src)) = HW_ICOLL_INTERRUPT__ENABLE;
-    else
-        __REG_CLR(HW_ICOLL_INTERRUPT(src)) = HW_ICOLL_INTERRUPT__ENABLE;
-}
-
-void imx233_softirq(int src, bool enable)
-{
-    if(enable)
-        __REG_SET(HW_ICOLL_INTERRUPT(src)) = HW_ICOLL_INTERRUPT__SOFTIRQ;
-    else
-        __REG_CLR(HW_ICOLL_INTERRUPT(src)) = HW_ICOLL_INTERRUPT__SOFTIRQ;
-}
-
 static void set_page_tables(void)
 {
     /* map every memory region to itself */
@@ -199,19 +92,8 @@ void memory_init(void)
 
 void system_init(void)
 {
-    imx233_reset_block(&HW_ICOLL_CTRL);
-    /* disable all interrupts */
-    for(int i = 0; i < INT_SRC_NR_SOURCES; i++)
-    {
-        /* priority = 0, disable, disable fiq */
-        HW_ICOLL_INTERRUPT(i) = 0;
-    }
-    /* setup vbase as isr_table */
-    HW_ICOLL_VBASE = (uint32_t)&isr_table;
-    /* enable final irq bit */
-    __REG_SET(HW_ICOLL_CTRL) = HW_ICOLL_CTRL__IRQ_FINAL_ENABLE;
-
     imx233_rtc_init();
+    imx233_icoll_init();
     imx233_pinctrl_init();
     imx233_timrot_init();
     imx233_dma_init();