Commit 86794b43 authored by Sonic Zhang's avatar Sonic Zhang Committed by Bob Liu

blackfin: SEC: clean up SEC interrupt initialization

Append the SEC IRQ after the IVG6, which is consistent to BF5xx SIC.
Exclude SIC irqchip fucntions from SEC code.
Call handle_fasteoi_irq in SEC error and fault handler.
Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
parent 1439d030
...@@ -40,8 +40,6 @@ ...@@ -40,8 +40,6 @@
#define IRQ_HWERR 5 /* Hardware Error */ #define IRQ_HWERR 5 /* Hardware Error */
#define IRQ_CORETMR 6 /* Core timer */ #define IRQ_CORETMR 6 /* Core timer */
#define BFIN_IRQ(x) ((x) + 7)
#define IVG7 7 #define IVG7 7
#define IVG8 8 #define IVG8 8
#define IVG9 9 #define IVG9 9
...@@ -52,6 +50,9 @@ ...@@ -52,6 +50,9 @@
#define IVG14 14 #define IVG14 14
#define IVG15 15 #define IVG15 15
#define BFIN_IRQ(x) ((x) + IVG7)
#define BFIN_SYSIRQ(x) ((x) - IVG7)
#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS) #define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
#endif #endif
...@@ -9,9 +9,6 @@ ...@@ -9,9 +9,6 @@
#include <mach-common/irq.h> #include <mach-common/irq.h>
#undef BFIN_IRQ
#define BFIN_IRQ(x) ((x) + IVG15)
#define NR_PERI_INTS (5 * 32) #define NR_PERI_INTS (5 * 32)
#define IRQ_SEC_ERR BFIN_IRQ(0) /* SEC Error */ #define IRQ_SEC_ERR BFIN_IRQ(0) /* SEC Error */
......
...@@ -174,7 +174,6 @@ void bfin_hibernate_syscontrol(void) ...@@ -174,7 +174,6 @@ void bfin_hibernate_syscontrol(void)
bfin_write32(DPM0_RESTORE5, bfin_read32(DPM0_RESTORE5) | 4); bfin_write32(DPM0_RESTORE5, bfin_read32(DPM0_RESTORE5) | 4);
} }
#define IRQ_SID(irq) ((irq) - IVG15)
asmlinkage void enter_deepsleep(void); asmlinkage void enter_deepsleep(void);
__attribute__((l1_text)) __attribute__((l1_text))
...@@ -311,7 +310,7 @@ static irqreturn_t test_isr(int irq, void *dev_id) ...@@ -311,7 +310,7 @@ static irqreturn_t test_isr(int irq, void *dev_id)
{ {
printk(KERN_DEBUG "gpio irq %d\n", irq); printk(KERN_DEBUG "gpio irq %d\n", irq);
if (irq == 231) if (irq == 231)
bfin_sec_raise_irq(IRQ_SID(IRQ_SOFT1)); bfin_sec_raise_irq(BFIN_SYSIRQ(IRQ_SOFT1));
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment