diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-12-14 16:41:33 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-12-14 16:41:33 +0000 |
| commit | d78864ef7c7b550de88f8494fed22bf6854c6627 (patch) | |
| tree | 1a38200fe1a33cb965650ca687167175938fbedd /target/linux/aruba-2.6/patches/002-irq.patch | |
| parent | 881d8c8f18644c9dbebd14b0783ee56782964bce (diff) | |
| download | master-187ad058-d78864ef7c7b550de88f8494fed22bf6854c6627.tar.gz master-187ad058-d78864ef7c7b550de88f8494fed22bf6854c6627.tar.bz2 master-187ad058-d78864ef7c7b550de88f8494fed22bf6854c6627.zip | |
Upgrade to Linux 2.6.19
- Includes large parts of the patch from #1021 by dpalffy
- Includes RB532 NAND driver changes by n0-1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5789 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/aruba-2.6/patches/002-irq.patch')
| -rw-r--r-- | target/linux/aruba-2.6/patches/002-irq.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/aruba-2.6/patches/002-irq.patch b/target/linux/aruba-2.6/patches/002-irq.patch index 137f18d588..cc5ea84c42 100644 --- a/target/linux/aruba-2.6/patches/002-irq.patch +++ b/target/linux/aruba-2.6/patches/002-irq.patch @@ -220,7 +220,7 @@ diff -Nur linux-2.6.17/arch/mips/aruba/irq.c linux-2.6.17-openwrt/arch/mips/arub + irq_desc[i].status = IRQ_DISABLED; + irq_desc[i].action = NULL; + irq_desc[i].depth = 1; -+ irq_desc[i].handler = &aruba_irq_type; ++ irq_desc[i].chip = &aruba_irq_type; + spin_lock_init(&irq_desc[i].lock); + } +} @@ -263,7 +263,7 @@ diff -Nur linux-2.6.17/arch/mips/aruba/irq.c linux-2.6.17-openwrt/arch/mips/arub + pend = READ_PEND_MUSCAT(addr); + pend &= ~READ_MASK_MUSCAT(addr); // only unmasked interrupts + pend = 39 - rc32434_clz(pend); -+ do_IRQ(pend + (group << 5), regs); ++ do_IRQ(pend + (group << 5)); + } + break; + case MACH_ARUBA_AP65: @@ -278,11 +278,11 @@ diff -Nur linux-2.6.17/arch/mips/aruba/irq.c linux-2.6.17-openwrt/arch/mips/arub + pend = READ_PEND_MERLOT(addr); + pend &= READ_MASK_MERLOT(addr); // only unmasked interrupts + pend = 31 - rc32434_clz(pend); -+ do_IRQ(pend + GROUP0_IRQ_BASE, regs); ++ do_IRQ(pend + GROUP0_IRQ_BASE); + } + if ((ip = (cp0_cause & 0x3c00))) { // irq 2-5 + pend = 31 - rc32434_clz(ip); -+ do_IRQ(pend - GROUP0_IRQ_BASE, regs); ++ do_IRQ(pend - GROUP0_IRQ_BASE); + } + break; + } |