Commit 1a5f1c4f authored by Ben Dooks's avatar Ben Dooks Committed by Jeff Garzik

DM9000: Pass IRQ flags via platform resources

Use the flags in the IRQ resource to specify the type of
IRQ being requested, so that systems which do not have
level-based interrupts, or change the interrupt in some
other way can specify this without making an #ifdef mess
in the driver.

This is specifically designed to undo the change in commit
4e4fc05a which hardwires the
type for everyone but blackfin to IRQT_RISING, which breaks
all a number of Simtec boards which use (and setup in the
bootloader) active low IRQs.

Note, although there where originally objections due to
the use of IORESOURCE_IRQ and IRQT_ flags not sharing the
same definition, at least <include/linux/interrupt.h> notes
these are the same.
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
CC: Daniel Mack <daniel@caiaq.de>
CC: Bryan Wu <bryan.wu@analog.com>
CC: Alex Landau <landau.alex@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 5b2b4ff0
...@@ -90,9 +90,9 @@ ...@@ -90,9 +90,9 @@
#define writesb outsb #define writesb outsb
#define writesw outsw #define writesw outsw
#define writesl outsl #define writesl outsl
#define DM9000_IRQ_FLAGS (IRQF_SHARED | IRQF_TRIGGER_HIGH) #define DEFAULT_TRIGGER IRQF_TRIGGER_HIGH
#else #else
#define DM9000_IRQ_FLAGS (IRQF_SHARED | IRQT_RISING) #define DEFAULT_TRIGGER (0)
#endif #endif
/* /*
...@@ -614,10 +614,21 @@ static int ...@@ -614,10 +614,21 @@ static int
dm9000_open(struct net_device *dev) dm9000_open(struct net_device *dev)
{ {
board_info_t *db = (board_info_t *) dev->priv; board_info_t *db = (board_info_t *) dev->priv;
unsigned long irqflags = db->irq_res->flags & IRQF_TRIGGER_MASK;
dev_dbg(db->dev, "entering %s\n", __func__); dev_dbg(db->dev, "entering %s\n", __func__);
if (request_irq(dev->irq, &dm9000_interrupt, DM9000_IRQ_FLAGS, dev->name, dev)) /* If there is no IRQ type specified, default to something that
* may work, and tell the user that this is a problem */
if (irqflags == IRQF_TRIGGER_NONE) {
dev_warn(db->dev, "WARNING: no IRQ resource flags set.\n");
irqflags = DEFAULT_TRIGGER;
}
irqflags |= IRQF_SHARED;
if (request_irq(dev->irq, &dm9000_interrupt, irqflags, dev->name, dev))
return -EAGAIN; return -EAGAIN;
/* Initialize DM9000 board */ /* Initialize DM9000 board */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment