Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e7b3dc7ef1e27fd5713a0df71f82c0a27de1c2eb

Authored by Russell King
Committed by Russell King
1 parent 1709e2af78
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 17 changed files with 36 additions and 36 deletions Side-by-side Diff

arch/arm/mach-omap1/board-fsample.c
Diff comments   View file @ e7b3dc7
... ... @@ -76,7 +76,7 @@
76 76 [1] = {
77 77 .start = INT_730_MPU_EXT_NIRQ,
78 78 .end = 0,
79   - .flags = IORESOURCE_IRQ,
  79 + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
80 80 },
81 81 };
82 82  
arch/arm/mach-omap1/board-h2.c
Diff comments   View file @ e7b3dc7
... ... @@ -209,7 +209,7 @@
209 209 [1] = {
210 210 .start = OMAP_GPIO_IRQ(0),
211 211 .end = OMAP_GPIO_IRQ(0),
212   - .flags = IORESOURCE_IRQ,
  212 + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
213 213 },
214 214 };
215 215  
arch/arm/mach-omap1/board-h3.c
Diff comments   View file @ e7b3dc7
... ... @@ -208,7 +208,7 @@
208 208 [1] = {
209 209 .start = OMAP_GPIO_IRQ(40),
210 210 .end = OMAP_GPIO_IRQ(40),
211   - .flags = IORESOURCE_IRQ,
  211 + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
212 212 },
213 213 };
214 214  
arch/arm/mach-omap1/board-innovator.c
Diff comments   View file @ e7b3dc7
... ... @@ -202,7 +202,7 @@
202 202 [1] = {
203 203 .start = OMAP1510_INT_ETHER,
204 204 .end = OMAP1510_INT_ETHER,
205   - .flags = IORESOURCE_IRQ,
  205 + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
206 206 },
207 207 };
208 208  
... ... @@ -269,7 +269,7 @@
269 269 [1] = {
270 270 .start = OMAP_GPIO_IRQ(0),
271 271 .end = OMAP_GPIO_IRQ(0),
272   - .flags = IORESOURCE_IRQ,
  272 + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
273 273 },
274 274 };
275 275  
arch/arm/mach-omap1/board-osk.c
Diff comments   View file @ e7b3dc7
... ... @@ -111,7 +111,7 @@
111 111 [1] = {
112 112 .start = OMAP_GPIO_IRQ(0),
113 113 .end = OMAP_GPIO_IRQ(0),
114   - .flags = IORESOURCE_IRQ,
  114 + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
115 115 },
116 116 };
117 117  
arch/arm/mach-omap1/board-perseus2.c
Diff comments   View file @ e7b3dc7
... ... @@ -75,7 +75,7 @@
75 75 [1] = {
76 76 .start = INT_730_MPU_EXT_NIRQ,
77 77 .end = 0,
78   - .flags = IORESOURCE_IRQ,
  78 + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
79 79 },
80 80 };
81 81  
arch/arm/mach-omap1/board-voiceblue.c
Diff comments   View file @ e7b3dc7
... ... @@ -117,7 +117,7 @@
117 117 [1] = {
118 118 .start = OMAP_GPIO_IRQ(8),
119 119 .end = OMAP_GPIO_IRQ(8),
120   - .flags = IORESOURCE_IRQ,
  120 + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
121 121 },
122 122 };
123 123  
arch/arm/mach-omap2/board-2430sdp.c
Diff comments   View file @ e7b3dc7
... ... @@ -104,7 +104,7 @@
104 104 [1] = {
105 105 .start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ),
106 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  
arch/arm/mach-omap2/board-apollon.c
Diff comments   View file @ e7b3dc7
... ... @@ -127,7 +127,7 @@
127 127 [1] = {
128 128 .start = OMAP_GPIO_IRQ(APOLLON_ETHR_GPIO_IRQ),
129 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  
arch/arm/mach-pxa/idp.c
Diff comments   View file @ e7b3dc7
... ... @@ -54,7 +54,7 @@
54 54 [1] = {
55 55 .start = IRQ_GPIO(4),
56 56 .end = IRQ_GPIO(4),
57   - .flags = IORESOURCE_IRQ,
  57 + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
58 58 }
59 59 };
60 60  
arch/arm/mach-pxa/littleton.c
Diff comments   View file @ e7b3dc7
... ... @@ -87,7 +87,7 @@
87 87 [1] = {
88 88 .start = IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO90)),
89 89 .end = IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO90)),
90   - .flags = IORESOURCE_IRQ,
  90 + .flags = IORESOURCE_IRQ | IRQF_TRIGGER_FALLING,
91 91 }
92 92 };
93 93  
arch/arm/mach-pxa/lubbock.c
Diff comments   View file @ e7b3dc7
... ... @@ -196,7 +196,7 @@
196 196 [1] = {
197 197 .start = LUBBOCK_ETH_IRQ,
198 198 .end = LUBBOCK_ETH_IRQ,
199   - .flags = IORESOURCE_IRQ,
  199 + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
200 200 },
201 201 [2] = {
202 202 .name = "smc91x-attrib",
arch/arm/mach-pxa/mainstone.c
Diff comments   View file @ e7b3dc7
... ... @@ -156,7 +156,7 @@
156 156 [1] = {
157 157 .start = MAINSTONE_IRQ(3),
158 158 .end = MAINSTONE_IRQ(3),
159   - .flags = IORESOURCE_IRQ,
  159 + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
160 160 }
161 161 };
162 162  
arch/arm/mach-pxa/zylonite.c
Diff comments   View file @ e7b3dc7
... ... @@ -47,7 +47,7 @@
47 47 [1] = {
48 48 .start = -1, /* for run-time assignment */
49 49 .end = -1,
50   - .flags = IORESOURCE_IRQ,
  50 + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
51 51 }
52 52 };
53 53  
arch/arm/plat-omap/debug-devices.c
Diff comments   View file @ e7b3dc7
... ... @@ -29,7 +29,7 @@
29 29 .flags = IORESOURCE_MEM,
30 30 },
31 31 [1] = {
32   - .flags = IORESOURCE_IRQ,
  32 + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
33 33 },
34 34 };
35 35  
drivers/net/smc91x.c
Diff comments   View file @ e7b3dc7
... ... @@ -1775,7 +1775,8 @@
1775 1775 * o actually GRAB the irq.
1776 1776 * o GRAB the region
1777 1777 */
1778   -static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr)
  1778 +static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr,
  1779 + unsigned long irq_flags)
1779 1780 {
1780 1781 struct smc_local *lp = netdev_priv(dev);
1781 1782 static int version_printed = 0;
... ... @@ -1941,7 +1942,7 @@
1941 1942 }
1942 1943  
1943 1944 /* Grab the IRQ */
1944   - retval = request_irq(dev->irq, &smc_interrupt, SMC_IRQ_FLAGS, dev->name, dev);
  1945 + retval = request_irq(dev->irq, &smc_interrupt, irq_flags, dev->name, dev);
1945 1946 if (retval)
1946 1947 goto err_out;
1947 1948  
1948 1949  
... ... @@ -2123,8 +2124,9 @@
2123 2124 static int smc_drv_probe(struct platform_device *pdev)
2124 2125 {
2125 2126 struct net_device *ndev;
2126   - struct resource *res;
  2127 + struct resource *res, *ires;
2127 2128 unsigned int __iomem *addr;
  2129 + unsigned long irq_flags = SMC_IRQ_FLAGS;
2128 2130 int ret;
2129 2131  
2130 2132 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs");
2131 2133  
... ... @@ -2150,12 +2152,17 @@
2150 2152 SET_NETDEV_DEV(ndev, &pdev->dev);
2151 2153  
2152 2154 ndev->dma = (unsigned char)-1;
2153   - ndev->irq = platform_get_irq(pdev, 0);
2154   - if (ndev->irq < 0) {
  2155 +
  2156 + ires = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
  2157 + if (!ires) {
2155 2158 ret = -ENODEV;
2156 2159 goto out_free_netdev;
2157 2160 }
2158 2161  
  2162 + ndev->irq = ires->start;
  2163 + if (SMC_IRQ_FLAGS == -1)
  2164 + irq_flags = ires->flags & IRQF_TRIGGER_MASK;
  2165 +
2159 2166 ret = smc_request_attrib(pdev);
2160 2167 if (ret)
2161 2168 goto out_free_netdev;
... ... @@ -2181,7 +2188,7 @@
2181 2188 #endif
2182 2189  
2183 2190 platform_set_drvdata(pdev, ndev);
2184   - ret = smc_probe(ndev, addr);
  2191 + ret = smc_probe(ndev, addr, irq_flags);
2185 2192 if (ret != 0)
2186 2193 goto out_iounmap;
2187 2194  
drivers/net/smc91x.h
Diff comments   View file @ e7b3dc7
... ... @@ -54,6 +54,7 @@
54 54 #define SMC_outw(v, a, r) writew(v, (a) + (r))
55 55 #define SMC_insw(a, r, p, l) readsw((a) + (r), p, l)
56 56 #define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l)
  57 +#define SMC_IRQ_FLAGS (-1) /* from resource */
57 58  
58 59 #elif defined(CONFIG_BLACKFIN)
59 60  
... ... @@ -158,7 +159,7 @@
158 159 #define SMC_outw(v, a, r) writew(v, (a) + (r))
159 160 #define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l)
160 161  
161   -#define SMC_IRQ_FLAGS (0)
  162 +#define SMC_IRQ_FLAGS (-1)
162 163  
163 164 #elif defined(CONFIG_SA1100_ASSABET)
164 165  
... ... @@ -177,6 +178,7 @@
177 178 #define SMC_outb(v, a, r) writeb(v, (a) + (r))
178 179 #define SMC_insb(a, r, p, l) readsb((a) + (r), p, (l))
179 180 #define SMC_outsb(a, r, p, l) writesb((a) + (r), p, (l))
  181 +#define SMC_IRQ_FLAGS (-1) /* from resource */
180 182  
181 183 #elif defined(CONFIG_MACH_LOGICPD_PXA270)
182 184  
... ... @@ -210,6 +212,7 @@
210 212 #define SMC_outl(v, a, r) writel(v, (a) + (r))
211 213 #define SMC_insl(a, r, p, l) readsl((a) + (r), p, l)
212 214 #define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l)
  215 +#define SMC_IRQ_FLAGS (-1) /* from resource */
213 216  
214 217 /* We actually can't write halfwords properly if not word aligned */
215 218 static inline void
... ... @@ -238,6 +241,7 @@
238 241 #define SMC_outsw(a, r, p, l) outsw((a) + (r), p, l)
239 242 #define SMC_outb(v, a, r) writeb(v, (a) + (r))
240 243 #define SMC_outw(v, a, r) writew(v, (a) + (r))
  244 +#define SMC_IRQ_FLAGS (-1) /* from resource */
241 245  
242 246 #elif defined(CONFIG_ARCH_OMAP)
243 247  
244 248  
... ... @@ -252,18 +256,8 @@
252 256 #define SMC_outw(v, a, r) writew(v, (a) + (r))
253 257 #define SMC_insw(a, r, p, l) readsw((a) + (r), p, l)
254 258 #define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l)
  259 +#define SMC_IRQ_FLAGS (-1) /* from resource */
255 260  
256   -#include <asm/mach-types.h>
257   -#include <asm/arch/cpu.h>
258   -
259   -#define SMC_IRQ_FLAGS (( \
260   - machine_is_omap_h2() \
261   - || machine_is_omap_h3() \
262   - || machine_is_omap_h4() \
263   - || (machine_is_omap_innovator() && !cpu_is_omap1510()) \
264   - ) ? IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING)
265   -
266   -
267 261 #elif defined(CONFIG_SH_SH4202_MICRODEV)
268 262  
269 263 #define SMC_CAN_USE_8BIT 0
... ... @@ -453,8 +447,7 @@
453 447 #define SMC_outl(v, a, r) writel(v, (a) + (r))
454 448 #define SMC_insl(a, r, p, l) readsl((a) + (r), p, l)
455 449 #define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l)
456   -
457   -#define SMC_IRQ_FLAGS (0)
  450 +#define SMC_IRQ_FLAGS (-1) /* from resource */
458 451  
459 452 #else
460 453