diff options
Diffstat (limited to 'include/asm-m68knommu/mcfne.h')
-rw-r--r-- | include/asm-m68knommu/mcfne.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/include/asm-m68knommu/mcfne.h b/include/asm-m68knommu/mcfne.h index c920ccdb61fe..431f63aadd0e 100644 --- a/include/asm-m68knommu/mcfne.h +++ b/include/asm-m68knommu/mcfne.h | |||
@@ -60,17 +60,6 @@ | |||
60 | #define NE2000_BYTE volatile unsigned char | 60 | #define NE2000_BYTE volatile unsigned char |
61 | #endif | 61 | #endif |
62 | 62 | ||
63 | #if defined(CONFIG_CFV240) | ||
64 | #define NE2000_ADDR 0x40010000 | ||
65 | #define NE2000_ADDR1 0x40010001 | ||
66 | #define NE2000_ODDOFFSET 0x00000000 | ||
67 | #define NE2000_IRQ 1 | ||
68 | #define NE2000_IRQ_VECTOR 0x19 | ||
69 | #define NE2000_IRQ_PRIORITY 2 | ||
70 | #define NE2000_IRQ_LEVEL 1 | ||
71 | #define NE2000_BYTE volatile unsigned char | ||
72 | #endif | ||
73 | |||
74 | #if defined(CONFIG_M5307C3) | 63 | #if defined(CONFIG_M5307C3) |
75 | #define NE2000_ADDR 0x40000300 | 64 | #define NE2000_ADDR 0x40000300 |
76 | #define NE2000_ODDOFFSET 0x00010000 | 65 | #define NE2000_ODDOFFSET 0x00010000 |
@@ -173,13 +162,8 @@ void ne2000_outsw(unsigned int addr, void *vbuf, unsigned long len); | |||
173 | * On most NE2000 implementations on ColdFire boards the chip is | 162 | * On most NE2000 implementations on ColdFire boards the chip is |
174 | * mapped in kinda funny, due to its ISA heritage. | 163 | * mapped in kinda funny, due to its ISA heritage. |
175 | */ | 164 | */ |
176 | #ifdef CONFIG_CFV240 | ||
177 | #define NE2000_PTR(addr) (NE2000_ADDR + ((addr & 0x3f) << 1) + 1) | ||
178 | #define NE2000_DATA_PTR(addr) (NE2000_ADDR + ((addr & 0x3f) << 1)) | ||
179 | #else | ||
180 | #define NE2000_PTR(addr) ((addr&0x1)?(NE2000_ODDOFFSET+addr-1):(addr)) | 165 | #define NE2000_PTR(addr) ((addr&0x1)?(NE2000_ODDOFFSET+addr-1):(addr)) |
181 | #define NE2000_DATA_PTR(addr) (addr) | 166 | #define NE2000_DATA_PTR(addr) (addr) |
182 | #endif | ||
183 | 167 | ||
184 | 168 | ||
185 | void ne2000_outb(unsigned int val, unsigned int addr) | 169 | void ne2000_outb(unsigned int val, unsigned int addr) |
@@ -285,17 +269,6 @@ void ne2000_irqsetup(int irq) | |||
285 | } | 269 | } |
286 | #endif | 270 | #endif |
287 | 271 | ||
288 | #if defined(CONFIG_CFV240) | ||
289 | void ne2000_irqsetup(int irq) | ||
290 | { | ||
291 | volatile unsigned char *icrp; | ||
292 | |||
293 | icrp = (volatile unsigned char *) (MCF_MBAR + MCFSIM_ICR1); | ||
294 | *icrp = MCFSIM_ICR_LEVEL1 | MCFSIM_ICR_PRI2 | MCFSIM_ICR_AUTOVEC; | ||
295 | mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_EINT1); | ||
296 | } | ||
297 | #endif | ||
298 | |||
299 | #if defined(CONFIG_M5206e) && defined(CONFIG_NETtel) | 272 | #if defined(CONFIG_M5206e) && defined(CONFIG_NETtel) |
300 | void ne2000_irqsetup(int irq) | 273 | void ne2000_irqsetup(int irq) |
301 | { | 274 | { |