diff options
| author | Sonic Zhang <sonic.zhang@analog.com> | 2012-12-14 11:19:24 +0800 |
|---|---|---|
| committer | Bob Liu <lliubbo@gmail.com> | 2012-12-14 11:20:22 +0800 |
| commit | 86794b43569c9b8936dff2e8eed503393379af6e (patch) | |
| tree | a1e22a88f584c300792167de4b59bae7ec37d9a3 /arch/blackfin/mach-bf609 | |
| parent | 1439d030b9032261f1111a2dd16b9a8ca11112ef (diff) | |
| download | blackbird-op-linux-86794b43569c9b8936dff2e8eed503393379af6e.tar.gz blackbird-op-linux-86794b43569c9b8936dff2e8eed503393379af6e.zip | |
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: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
Diffstat (limited to 'arch/blackfin/mach-bf609')
| -rw-r--r-- | arch/blackfin/mach-bf609/include/mach/irq.h | 3 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf609/pm.c | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/blackfin/mach-bf609/include/mach/irq.h b/arch/blackfin/mach-bf609/include/mach/irq.h index 23e74cdeeee8..fa0843d5d77a 100644 --- a/arch/blackfin/mach-bf609/include/mach/irq.h +++ b/arch/blackfin/mach-bf609/include/mach/irq.h @@ -9,9 +9,6 @@ #include <mach-common/irq.h> -#undef BFIN_IRQ -#define BFIN_IRQ(x) ((x) + IVG15) - #define NR_PERI_INTS (5 * 32) #define IRQ_SEC_ERR BFIN_IRQ(0) /* SEC Error */ diff --git a/arch/blackfin/mach-bf609/pm.c b/arch/blackfin/mach-bf609/pm.c index dacafc163f76..ad505d9db4a8 100644 --- a/arch/blackfin/mach-bf609/pm.c +++ b/arch/blackfin/mach-bf609/pm.c @@ -174,7 +174,6 @@ void bfin_hibernate_syscontrol(void) bfin_write32(DPM0_RESTORE5, bfin_read32(DPM0_RESTORE5) | 4); } -#define IRQ_SID(irq) ((irq) - IVG15) asmlinkage void enter_deepsleep(void); __attribute__((l1_text)) @@ -311,7 +310,7 @@ static irqreturn_t test_isr(int irq, void *dev_id) { printk(KERN_DEBUG "gpio irq %d\n", irq); if (irq == 231) - bfin_sec_raise_irq(IRQ_SID(IRQ_SOFT1)); + bfin_sec_raise_irq(BFIN_SYSIRQ(IRQ_SOFT1)); return IRQ_HANDLED; } |
