diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-23 15:51:38 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2011-10-25 19:51:26 -0400 |
commit | 74b654176aa15e06b81f26416654b9cd91bd9601 (patch) | |
tree | 91820bba026743c7d6fb931e8c45621094c3af78 /arch/blackfin | |
parent | ae41f32e16d8e87c84cb910a6a6aefb50318894d (diff) | |
download | linux-stable-74b654176aa15e06b81f26416654b9cd91bd9601.tar.gz linux-stable-74b654176aa15e06b81f26416654b9cd91bd9601.tar.bz2 linux-stable-74b654176aa15e06b81f26416654b9cd91bd9601.zip |
Blackfin: H8606: fixup bogus ioresource init
IRQF_SHARED is not part of the IORESOURCE_IRQ bits. It's expressed by
IORESOURCE_IRQ_SHAREABLE.
IORESOURCE_IRQ_HIGHEDGE and IRQF_TRIGGER_HIGH are contradicting
values, an interrupt can hardly be configured for both level and edge
at the same time. This was introduced in commit 45138439(Blackfin
arch: flash memory map and dm9000 resources updating) of course
without any hint in the changelog what the heck this is supposed to
do.
Acked-by: Javier Herrero <jherrero@hvsistemas.es>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r-- | arch/blackfin/mach-bf533/boards/H8606.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c index eb325ed6607e..5da5787fc4ef 100644 --- a/arch/blackfin/mach-bf533/boards/H8606.c +++ b/arch/blackfin/mach-bf533/boards/H8606.c @@ -54,7 +54,8 @@ static struct resource dm9000_resources[] = { [2] = { .start = IRQ_PF10, .end = IRQ_PF10, - .flags = (IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE | IRQF_SHARED | IRQF_TRIGGER_HIGH), + .flags = (IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE | + IORESOURCE_IRQ_SHAREABLE), }, }; |