hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
Russell King 2008-01-14 22:30:10 +00:00 committed by Russell King
parent 1709e2af78
commit e7b3dc7ef1
17 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap1/board-fsample.c
View File

@ -76,7 +76,7 @@ static struct resource smc91x_resources[] = {
[1] = { [1] = {
.start = INT_730_MPU_EXT_NIRQ, .start = INT_730_MPU_EXT_NIRQ,
.end = 0, .end = 0,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
}, },
}; };

2
arch/arm/mach-omap1/board-h2.c
View File

@ -209,7 +209,7 @@ static struct resource h2_smc91x_resources[] = {
[1] = { [1] = {
.start = OMAP_GPIO_IRQ(0), .start = OMAP_GPIO_IRQ(0),
.end = OMAP_GPIO_IRQ(0), .end = OMAP_GPIO_IRQ(0),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
}, },
}; };

2
arch/arm/mach-omap1/board-h3.c
View File

@ -208,7 +208,7 @@ static struct resource smc91x_resources[] = {
[1] = { [1] = {
.start = OMAP_GPIO_IRQ(40), .start = OMAP_GPIO_IRQ(40),
.end = OMAP_GPIO_IRQ(40), .end = OMAP_GPIO_IRQ(40),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
}, },
}; };

4
arch/arm/mach-omap1/board-innovator.c
View File

@ -202,7 +202,7 @@ static struct resource innovator1510_smc91x_resources[] = {
[1] = { [1] = {
.start = OMAP1510_INT_ETHER, .start = OMAP1510_INT_ETHER,
.end = OMAP1510_INT_ETHER, .end = OMAP1510_INT_ETHER,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
}, },
}; };
@ -269,7 +269,7 @@ static struct resource innovator1610_smc91x_resources[] = {
[1] = { [1] = {
.start = OMAP_GPIO_IRQ(0), .start = OMAP_GPIO_IRQ(0),
.end = OMAP_GPIO_IRQ(0), .end = OMAP_GPIO_IRQ(0),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
}, },
}; };

2
arch/arm/mach-omap1/board-osk.c
View File

@ -111,7 +111,7 @@ static struct resource osk5912_smc91x_resources[] = {
[1] = { [1] = {
.start = OMAP_GPIO_IRQ(0), .start = OMAP_GPIO_IRQ(0),
.end = OMAP_GPIO_IRQ(0), .end = OMAP_GPIO_IRQ(0),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
}, },
}; };

2
arch/arm/mach-omap1/board-perseus2.c
View File

@ -75,7 +75,7 @@ static struct resource smc91x_resources[] = {
[1] = { [1] = {
.start = INT_730_MPU_EXT_NIRQ, .start = INT_730_MPU_EXT_NIRQ,
.end = 0, .end = 0,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
}, },
}; };

2
arch/arm/mach-omap1/board-voiceblue.c
View File

@ -117,7 +117,7 @@ static struct resource voiceblue_smc91x_resources[] = {
[1] = { [1] = {
.start = OMAP_GPIO_IRQ(8), .start = OMAP_GPIO_IRQ(8),
.end = OMAP_GPIO_IRQ(8), .end = OMAP_GPIO_IRQ(8),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
}, },
}; };

2
arch/arm/mach-omap2/board-2430sdp.c
View File

@ -104,7 +104,7 @@ static struct resource sdp2430_smc91x_resources[] = {
[1] = { [1] = {
.start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), .start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ),
.end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), .end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
}, },
}; };

2
arch/arm/mach-omap2/board-apollon.c
View File

@ -127,7 +127,7 @@ static struct resource apollon_smc91x_resources[] = {
[1] = { [1] = {
.start = OMAP_GPIO_IRQ(APOLLON_ETHR_GPIO_IRQ), .start = OMAP_GPIO_IRQ(APOLLON_ETHR_GPIO_IRQ),
.end = OMAP_GPIO_IRQ(APOLLON_ETHR_GPIO_IRQ), .end = OMAP_GPIO_IRQ(APOLLON_ETHR_GPIO_IRQ),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
}, },
}; };

2
arch/arm/mach-pxa/idp.c
View File

@ -54,7 +54,7 @@ static struct resource smc91x_resources[] = {
[1] = { [1] = {
.start = IRQ_GPIO(4), .start = IRQ_GPIO(4),
.end = IRQ_GPIO(4), .end = IRQ_GPIO(4),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
} }
}; };

2
arch/arm/mach-pxa/littleton.c
View File

@ -87,7 +87,7 @@ static struct resource smc91x_resources[] = {
[1] = { [1] = {
.start = IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO90)), .start = IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO90)),
.end = IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO90)), .end = IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO90)),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IRQF_TRIGGER_FALLING,
} }
}; };

2
arch/arm/mach-pxa/lubbock.c
View File

@ -196,7 +196,7 @@ static struct resource smc91x_resources[] = {
[1] = { [1] = {
.start = LUBBOCK_ETH_IRQ, .start = LUBBOCK_ETH_IRQ,
.end = LUBBOCK_ETH_IRQ, .end = LUBBOCK_ETH_IRQ,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
}, },
[2] = { [2] = {
.name = "smc91x-attrib", .name = "smc91x-attrib",

2
arch/arm/mach-pxa/mainstone.c
View File

@ -156,7 +156,7 @@ static struct resource smc91x_resources[] = {
[1] = { [1] = {
.start = MAINSTONE_IRQ(3), .start = MAINSTONE_IRQ(3),
.end = MAINSTONE_IRQ(3), .end = MAINSTONE_IRQ(3),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
} }
}; };

2
arch/arm/mach-pxa/zylonite.c
View File

@ -47,7 +47,7 @@ static struct resource smc91x_resources[] = {
[1] = { [1] = {
.start = -1, /* for run-time assignment */ .start = -1, /* for run-time assignment */
.end = -1, .end = -1,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
} }
}; };

2
arch/arm/plat-omap/debug-devices.c
View File

@ -29,7 +29,7 @@ static struct resource smc91x_resources[] = {
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
}, },
}; };

19
drivers/net/smc91x.c
View File

@ -1775,7 +1775,8 @@ static int __init smc_findirq(void __iomem *ioaddr)
* o actually GRAB the irq. * o actually GRAB the irq.
* o GRAB the region * o GRAB the region
*/ */
static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr) static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr,
unsigned long irq_flags)
{ {
struct smc_local *lp = netdev_priv(dev); struct smc_local *lp = netdev_priv(dev);
static int version_printed = 0; static int version_printed = 0;
@ -1941,7 +1942,7 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr)
} }
/* Grab the IRQ */ /* Grab the IRQ */
retval = request_irq(dev->irq, &smc_interrupt, SMC_IRQ_FLAGS, dev->name, dev); retval = request_irq(dev->irq, &smc_interrupt, irq_flags, dev->name, dev);
if (retval) if (retval)
goto err_out; goto err_out;
@ -2123,8 +2124,9 @@ static void smc_release_datacs(struct platform_device *pdev, struct net_device *
static int smc_drv_probe(struct platform_device *pdev) static int smc_drv_probe(struct platform_device *pdev)
{ {
struct net_device *ndev; struct net_device *ndev;
struct resource *res; struct resource *res, *ires;
unsigned int __iomem *addr; unsigned int __iomem *addr;
unsigned long irq_flags = SMC_IRQ_FLAGS;
int ret; int ret;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs");
@ -2150,12 +2152,17 @@ static int smc_drv_probe(struct platform_device *pdev)
SET_NETDEV_DEV(ndev, &pdev->dev); SET_NETDEV_DEV(ndev, &pdev->dev);
ndev->dma = (unsigned char)-1; ndev->dma = (unsigned char)-1;
ndev->irq = platform_get_irq(pdev, 0);
if (ndev->irq < 0) { ires = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!ires) {
ret = -ENODEV; ret = -ENODEV;
goto out_free_netdev; goto out_free_netdev;
} }
ndev->irq = ires->start;
if (SMC_IRQ_FLAGS == -1)
irq_flags = ires->flags & IRQF_TRIGGER_MASK;
ret = smc_request_attrib(pdev); ret = smc_request_attrib(pdev);
if (ret) if (ret)
goto out_free_netdev; goto out_free_netdev;
@ -2181,7 +2188,7 @@ static int smc_drv_probe(struct platform_device *pdev)
#endif #endif
platform_set_drvdata(pdev, ndev); platform_set_drvdata(pdev, ndev);
ret = smc_probe(ndev, addr); ret = smc_probe(ndev, addr, irq_flags);
if (ret != 0) if (ret != 0)
goto out_iounmap; goto out_iounmap;

21
drivers/net/smc91x.h
View File

@ -54,6 +54,7 @@
#define SMC_outw(v, a, r) writew(v, (a) + (r)) #define SMC_outw(v, a, r) writew(v, (a) + (r))
#define SMC_insw(a, r, p, l) readsw((a) + (r), p, l) #define SMC_insw(a, r, p, l) readsw((a) + (r), p, l)
#define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l) #define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l)
#define SMC_IRQ_FLAGS (-1) /* from resource */
#elif defined(CONFIG_BLACKFIN) #elif defined(CONFIG_BLACKFIN)
@ -158,7 +159,7 @@
#define SMC_outw(v, a, r) writew(v, (a) + (r)) #define SMC_outw(v, a, r) writew(v, (a) + (r))
#define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l) #define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l)
#define SMC_IRQ_FLAGS (0) #define SMC_IRQ_FLAGS (-1)
#elif defined(CONFIG_SA1100_ASSABET) #elif defined(CONFIG_SA1100_ASSABET)
@ -177,6 +178,7 @@
#define SMC_outb(v, a, r) writeb(v, (a) + (r)) #define SMC_outb(v, a, r) writeb(v, (a) + (r))
#define SMC_insb(a, r, p, l) readsb((a) + (r), p, (l)) #define SMC_insb(a, r, p, l) readsb((a) + (r), p, (l))
#define SMC_outsb(a, r, p, l) writesb((a) + (r), p, (l)) #define SMC_outsb(a, r, p, l) writesb((a) + (r), p, (l))
#define SMC_IRQ_FLAGS (-1) /* from resource */
#elif defined(CONFIG_MACH_LOGICPD_PXA270) #elif defined(CONFIG_MACH_LOGICPD_PXA270)
@ -210,6 +212,7 @@
#define SMC_outl(v, a, r) writel(v, (a) + (r)) #define SMC_outl(v, a, r) writel(v, (a) + (r))
#define SMC_insl(a, r, p, l) readsl((a) + (r), p, l) #define SMC_insl(a, r, p, l) readsl((a) + (r), p, l)
#define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l) #define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l)
#define SMC_IRQ_FLAGS (-1) /* from resource */
/* We actually can't write halfwords properly if not word aligned */ /* We actually can't write halfwords properly if not word aligned */
static inline void static inline void
@ -238,6 +241,7 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
#define SMC_outsw(a, r, p, l) outsw((a) + (r), p, l) #define SMC_outsw(a, r, p, l) outsw((a) + (r), p, l)
#define SMC_outb(v, a, r) writeb(v, (a) + (r)) #define SMC_outb(v, a, r) writeb(v, (a) + (r))
#define SMC_outw(v, a, r) writew(v, (a) + (r)) #define SMC_outw(v, a, r) writew(v, (a) + (r))
#define SMC_IRQ_FLAGS (-1) /* from resource */
#elif defined(CONFIG_ARCH_OMAP) #elif defined(CONFIG_ARCH_OMAP)
@ -252,17 +256,7 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
#define SMC_outw(v, a, r) writew(v, (a) + (r)) #define SMC_outw(v, a, r) writew(v, (a) + (r))
#define SMC_insw(a, r, p, l) readsw((a) + (r), p, l) #define SMC_insw(a, r, p, l) readsw((a) + (r), p, l)
#define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l) #define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l)
#define SMC_IRQ_FLAGS (-1) /* from resource */
#include <asm/mach-types.h>
#include <asm/arch/cpu.h>
#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)
#elif defined(CONFIG_SH_SH4202_MICRODEV) #elif defined(CONFIG_SH_SH4202_MICRODEV)
@ -453,8 +447,7 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r,
#define SMC_outl(v, a, r) writel(v, (a) + (r)) #define SMC_outl(v, a, r) writel(v, (a) + (r))
#define SMC_insl(a, r, p, l) readsl((a) + (r), p, l) #define SMC_insl(a, r, p, l) readsl((a) + (r), p, l)
#define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l) #define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l)
#define SMC_IRQ_FLAGS (-1) /* from resource */
#define SMC_IRQ_FLAGS (0)
#else #else