Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

m68knommu: remove special interrupt handling code for ne2k support

The improved interrupt support for ColdFire CPU cores means we no
longer need all the interrupt setup and ack hacks to support the NE2000
driver on ColdFire platforms. Remove all that code.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>

-83
-83
arch/m68k/include/asm/mcfne.h
··· 239 239 #endif /* NE2000_OFFOFFSET */ 240 240 241 241 /****************************************************************************/ 242 - 243 - #ifdef COLDFIRE_NE2000_FUNCS 244 - 245 - /* 246 - * Lastly the interrupt set up code... 247 - * Minor differences between the different board types. 248 - */ 249 - 250 - #if defined(CONFIG_ARN5206) 251 - void ne2000_irqsetup(int irq) 252 - { 253 - volatile unsigned char *icrp; 254 - 255 - icrp = (volatile unsigned char *) (MCF_MBAR + MCFSIM_ICR4); 256 - *icrp = MCFSIM_ICR_LEVEL4 | MCFSIM_ICR_PRI2; 257 - mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_EINT4); 258 - } 259 - #endif 260 - 261 - #if defined(CONFIG_M5206eC3) 262 - void ne2000_irqsetup(int irq) 263 - { 264 - volatile unsigned char *icrp; 265 - 266 - icrp = (volatile unsigned char *) (MCF_MBAR + MCFSIM_ICR4); 267 - *icrp = MCFSIM_ICR_LEVEL4 | MCFSIM_ICR_PRI2 | MCFSIM_ICR_AUTOVEC; 268 - mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_EINT4); 269 - } 270 - #endif 271 - 272 - #if defined(CONFIG_M5206e) && defined(CONFIG_NETtel) 273 - void ne2000_irqsetup(int irq) 274 - { 275 - mcf_autovector(irq); 276 - } 277 - #endif 278 - 279 - #if defined(CONFIG_M5272) && defined(CONFIG_NETtel) 280 - void ne2000_irqsetup(int irq) 281 - { 282 - volatile unsigned long *icrp; 283 - volatile unsigned long *pitr; 284 - 285 - /* The NE2000 device uses external IRQ3 */ 286 - icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1); 287 - *icrp = (*icrp & 0x77077777) | 0x00d00000; 288 - 289 - pitr = (volatile unsigned long *) (MCF_MBAR + MCFSIM_PITR); 290 - *pitr = *pitr | 0x20000000; 291 - } 292 - 293 - void ne2000_irqack(int irq) 294 - { 295 - volatile unsigned long *icrp; 296 - 297 - /* The NE2000 device uses external IRQ3 */ 298 - icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1); 299 - *icrp = (*icrp & 0x77777777) | 0x00800000; 300 - } 301 - #endif 302 - 303 - #if defined(CONFIG_M5307) || defined(CONFIG_M5407) 304 - #if defined(CONFIG_NETtel) || defined(CONFIG_SECUREEDGEMP3) 305 - 306 - void ne2000_irqsetup(int irq) 307 - { 308 - mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_EINT3); 309 - mcf_autovector(irq); 310 - } 311 - 312 - #else 313 - 314 - void ne2000_irqsetup(int irq) 315 - { 316 - mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_EINT3); 317 - } 318 - 319 - #endif /* ! CONFIG_NETtel || CONFIG_SECUREEDGEMP3 */ 320 - #endif /* CONFIG_M5307 || CONFIG_M5407 */ 321 - 322 - #endif /* COLDFIRE_NE2000_FUNCS */ 323 - 324 - /****************************************************************************/ 325 242 #endif /* mcfne_h */