Merge tag 'kvm-3.6-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[~andy/linux] / arch / blackfin / mach-bf609 / pm.c

diff --git a/arch/blackfin/mach-bf609/pm.c b/arch/blackfin/mach-bf609/pm.c
index 0211ebd142c4420bc62884b1a02b181c01551207..dacafc163f76a7230d924bfbdad696639ab6a822 100644 (file)
--- a/arch/blackfin/mach-bf609/pm.c
+++ b/arch/blackfin/mach-bf609/pm.c
@@ -174,11 +174,7 @@ void bfin_hibernate_syscontrol(void)
        bfin_write32(DPM0_RESTORE5, bfin_read32(DPM0_RESTORE5) | 4);
 }
 
-#ifndef CONFIG_BF60x
-# define SIC_SYSIRQ(irq)       (irq - (IRQ_CORETMR + 1))
-#else
-# define SIC_SYSIRQ(irq)       ((irq) - IVG15)
-#endif
+#define IRQ_SID(irq)   ((irq) - IVG15)
 asmlinkage void enter_deepsleep(void);
 
 __attribute__((l1_text))
@@ -314,6 +310,8 @@ static struct syscore_ops smc_pm_syscore_ops = {
 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));
        return IRQ_HANDLED;
 }
 
@@ -323,7 +321,6 @@ static irqreturn_t dpm0_isr(int irq, void *dev_id)
        bfin_write32(CGU0_STAT, bfin_read32(CGU0_STAT));
        return IRQ_HANDLED;
 }
-#endif
 
 static int __init bf609_init_pm(void)
 {