diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 10:54:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 10:54:27 -0800 |
| commit | 4351654e3ddf86a04966163dce4def586303e5cc (patch) | |
| tree | eeb683133e78fbe522c80d0895f94ce4ca699a23 /arch/blackfin/mach-bf609 | |
| parent | 3d9de1909b339f967f1b37367df233a0dcfc10cf (diff) | |
| parent | 86794b43569c9b8936dff2e8eed503393379af6e (diff) | |
| download | blackbird-op-linux-4351654e3ddf86a04966163dce4def586303e5cc.tar.gz blackbird-op-linux-4351654e3ddf86a04966163dce4def586303e5cc.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin
Pull blackfin update from Bob Liu.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin:
blackfin: SEC: clean up SEC interrupt initialization
blackfin: kgdb: call generic_exec_single() directly
blackfin: anomaly: add anomaly 16000030 for bf5xx
Blackfin: dpmc: use module_platform_driver macro
Blackfin: remove unused is_in_rom()
Blackfin: remove unnecessary prototype for kobjsize()
Blackfin: twi: Add missing __iomem annotation
Blackfin: Annotate strnlen_user and strlen_user 'src' parameter with __user
Blackfin: Annotate clear_user 'to' parameter with __user
Blackfin: Add missing __user annotations to put_user
Blackfin: Annotate strncpy_from_user src parameter with __user
blackfin: Use Kbuild infrastructure for kvm_para.h
UAPI: (Scripted) Disintegrate arch/blackfin/include/asm
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; } |
