From: Tony Lindgren Date: Thu, 16 Nov 2006 00:31:23 +0000 (+0200) Subject: smc91x: Clean up omap interrupt level X-Git-Tag: v2.6.19-omap1~53 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9d910bf2e37be35f9bdedafe372dcacac8853424;p=linux-2.6-omap-h63xx.git smc91x: Clean up omap interrupt level Since omap1 does not have level GPIO interrupts, all omap1 class processors should use falling edge, except for Innovator which routes the interrupt via FPGA and needs rising edge. All omap2 class processors should use low level interrupt. Signed-off-by: Tony Lindgren --- diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index a8640169fc7..7977b7c4cc3 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h @@ -192,13 +192,12 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) #include #include -#define SMC_IRQ_FLAGS (( \ - machine_is_omap_h2() \ - || machine_is_omap_h3() \ - || machine_is_omap_h4() \ - || (machine_is_omap_innovator() && !cpu_is_omap1510()) \ - ) ? IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING) - +#ifdef CONFIG_ARCH_OMAP1 +#define SMC_IRQ_FLAGS (machine_is_omap_innovator() ? IRQF_TRIGGER_RISING : \ + IRQF_TRIGGER_FALLING) +#else +#define SMC_IRQ_FLAGS IRQF_TRIGGER_LOW +#endif #elif defined(CONFIG_SH_SH4202_MICRODEV)