diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-01-14 17:30:10 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-01-28 08:13:19 -0500 |
commit | e7b3dc7ef1e27fd5713a0df71f82c0a27de1c2eb (patch) | |
tree | f7a6b3b79c7340d4aba0e66b16c8bfdb19e6bc87 /arch/arm/mach-omap2 | |
parent | 1709e2af784ea658cec4e91fc884508d1214d6f5 (diff) |
[NET] smc91x: Make smc91x use IRQ resource trigger flags
smc91x is shared between many different platforms. Each platform needs
to specify the interrupt type, and in some cases the irq type depends
on more than just the build configuration - it depends on runtime
checks.
Rather than throwing this code into the SMC_IRQ_FLAGS definition, provide
a way for these flags to be passed via the IRQ resource itself.
Note that IRQF_TRIGGER_* constants are intentionally defined to correspond
with the IORESOURCE_IRQ_* interrupt type flags, in much the same way that
the low bits of PCI iomem resources correspond with the BAR flag bits.
Also provide a way to configure smc91x to read the IRQ flags from the
resource. Once all platforms have been converted over (signified
by all definitions of SMC_IRQ_FLAGS being -1) SMC_IRQ_FLAGS should
be removed.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Nicolas Pitre <nico@cam.org>
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/board-2430sdp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-apollon.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index 7e76fbf19b5d..64235dee5614 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c | |||
@@ -104,7 +104,7 @@ static struct resource sdp2430_smc91x_resources[] = { | |||
104 | [1] = { | 104 | [1] = { |
105 | .start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), | 105 | .start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), |
106 | .end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), | 106 | .end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), |
107 | .flags = IORESOURCE_IRQ, | 107 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, |
108 | }, | 108 | }, |
109 | }; | 109 | }; |
110 | 110 | ||
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index 3bb49c17c858..401a53c1ca6e 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c | |||
@@ -127,7 +127,7 @@ static struct resource apollon_smc91x_resources[] = { | |||
127 | [1] = { | 127 | [1] = { |
128 | .start = OMAP_GPIO_IRQ(APOLLON_ETHR_GPIO_IRQ), | 128 | .start = OMAP_GPIO_IRQ(APOLLON_ETHR_GPIO_IRQ), |
129 | .end = OMAP_GPIO_IRQ(APOLLON_ETHR_GPIO_IRQ), | 129 | .end = OMAP_GPIO_IRQ(APOLLON_ETHR_GPIO_IRQ), |
130 | .flags = IORESOURCE_IRQ, | 130 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, |
131 | }, | 131 | }, |
132 | }; | 132 | }; |
133 | 133 | ||