Add forgotten part of vlynq irq setup
authorEugene Konev <ejka@imfi.kspu.ru>
Sun, 18 Mar 2007 16:00:28 +0000 (16:00 +0000)
committerEugene Konev <ejka@imfi.kspu.ru>
Sun, 18 Mar 2007 16:00:28 +0000 (16:00 +0000)
SVN-Revision: 6606

target/linux/ar7-2.6/files/arch/mips/ar7/vlynq-pci.c
target/linux/ar7-2.6/files/arch/mips/ar7/vlynq.c

index eb32de0..a32ea8d 100644 (file)
@@ -22,6 +22,7 @@
 #include <linux/pci.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <asm/ar7/vlynq.h>
 
 #define VLYNQ_PCI_SLOTS 2
@@ -61,6 +62,7 @@ static struct vlynq_pci_config known_devices[] = {
                        { .size = 0x0, .offset = 0x0 },
                },
                .irq = 0, .chip = 0x9066104c,
+               .irq_type = IRQ_TYPE_EDGE_RISING,
                .class = PCI_CLASS_NETWORK_OTHER,
                .num_regs = 5,
                .regs = { 
@@ -313,6 +315,8 @@ static int vlynq_pci_probe(struct vlynq_device *dev)
        vlynq_set_local_mapping(dev, dev->mem_start, mapping);
        vlynq_set_remote_mapping(dev, 0, config->rx_mapping);
 
+       set_irq_type(vlynq_virq_to_irq(dev, config->irq), config->irq_type);
+
        addr = (u32)ioremap_nocache(dev->mem_start, 0x10000);
        if (!addr) {
                printk(KERN_ERR "%s: failed to remap io memory\n",
index 80cb836..e0d3b1f 100644 (file)
@@ -117,7 +117,7 @@ static void vlynq_irq_unmask(unsigned int irq)
        BUG_ON(!dev);
        virq = irq - dev->irq_start;
        val = dev->remote->int_device[virq >> 2];
-       val |= VINT_ENABLE << VINT_OFFSET(virq);
+       val |= (VINT_ENABLE | virq) << VINT_OFFSET(virq);
        dev->remote->int_device[virq >> 2] = val;
 }