ARM: OMAP: Fix Apollon and OSK ethernet IRQ flags
PATCH 1/1 ARM: OMAP: Fix Apollon and OSK ethernet IRQ flags
Fix IRQ flags for Apollon and OSK (OMAP5912) board. Apollon fix from Kyungmin Park (kyungmin.park_at_samsung.com):
Apollon (omap2420) use IRQF_TRIGGER_RISING which means IRQF_TRIGGER_HIGH.
drivers/net/smc91x.h +5 -3
@@ -193,10 +193,12 @@ SMC_outw(u16 val, void __iomem *ioaddr,#include <asm/arch/cpu.h> #ifdef CONFIG_ARCH_OMAP1 -#define SMC_IRQ_FLAGS (machine_is_omap_innovator() ? IRQF_TRIGGER_RISING : \ - IRQF_TRIGGER_FALLING) +#define SMC_IRQ_FLAGS ((machine_is_omap_innovator() || \ + machine_is_omap_osk()) \ + ? IRQF_TRIGGER_RISING : IRQF_TRIGGER_FALLING)#else -#define SMC_IRQ_FLAGS IRQF_TRIGGER_LOW +#define SMC_IRQ_FLAGS (machine_is_omap_apollon() \ + ? IRQF_TRIGGER_HIGH : IRQF_TRIGGER_LOW)#endif #elif defined(CONFIG_SH_SH4202_MICRODEV )
Quoted 21 lines · Dirk Behme
Fix IRQ flags for Apollon and OSK (OMAP5912) board. Apollon fix from
Kyungmin Park (kyungmin.park_at_samsung.com):Apollon (omap2420) use
IRQF_TRIGGER_RISINGwhich meansIRQF_TRIGGER_HIGH.Signed-off-by Dirk Behme <dirk.behme_at_gmail.com>Index:
linux-osk/drivers/net/smc91x.h
===================================================================drivers/net/smc91x.h +0
-2@@ -193,10 +193,12 @@ SMC_outw(u16 val, void __iomem *ioaddr,#include <asm/arch/cpu.h> #ifdef CONFIG_ARCH_OMAP1 -#define SMC_IRQ_FLAGS (machine_is_omap_innovator() ? IRQF_TRIGGER_RISING : \ - IRQF_TRIGGER_FALLING)
drivers/net/smc91x.h SMC_outw(u16 val, void __iomem *ioaddr, · line 204
Quoted 10 lines
drivers/net/smc91x.h +5
-1+#define SMC_IRQ_FLAGS ((machine_is_omap_innovator() || \ + machine_is_omap_osk()) \ + ? IRQF_TRIGGER_RISING : IRQF_TRIGGER_FALLING)#else -#define SMC_IRQ_FLAGS IRQF_TRIGGER_LOW +#define SMC_IRQ_FLAGS (machine_is_omap_apollon() \ + ? IRQF_TRIGGER_HIGH : IRQF_TRIGGER_LOW)#endif #elif defined(CONFIG_SH_SH4202_MICRODEV)
Heh, thanks pushing today. Did I manage to break any other boards? :)
Tony
Quoted 3 lines · Tony Lindgren
Quoted 1 line · Dirk Behme
Fix IRQ flags for Apollon and OSK (OMAP5912) board.
...
Quoted 1 line
Heh, thanks pushing today. Did I manage to break any other boards? :)
Thanks for pushing! Looking at defconfigs we have CONFIG_SMC91X=y for innovator_1610, innovator_1510, h2, h3, h4, osk, 2430sdp, apollon and perseus2. Except perseus2 all boards should be covered now.
Hint: perseus2 is worth a check ;)
Dirk