diff options
Diffstat (limited to 'drivers/net/smc91x.h')
-rw-r--r-- | drivers/net/smc91x.h | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 9f9f8f2d5338..7aa7fbac8224 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
@@ -184,16 +184,10 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) | |||
184 | #define SMC_IO_SHIFT 0 | 184 | #define SMC_IO_SHIFT 0 |
185 | #define SMC_NOWAIT 1 | 185 | #define SMC_NOWAIT 1 |
186 | 186 | ||
187 | #define SMC_inb(a, r) readb((a) + (r)) | ||
188 | #define SMC_outb(v, a, r) writeb(v, (a) + (r)) | ||
189 | #define SMC_inw(a, r) readw((a) + (r)) | 187 | #define SMC_inw(a, r) readw((a) + (r)) |
190 | #define SMC_outw(v, a, r) writew(v, (a) + (r)) | 188 | #define SMC_outw(v, a, r) writew(v, (a) + (r)) |
191 | #define SMC_insw(a, r, p, l) readsw((a) + (r), p, l) | 189 | #define SMC_insw(a, r, p, l) readsw((a) + (r), p, l) |
192 | #define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l) | 190 | #define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l) |
193 | #define SMC_inl(a, r) readl((a) + (r)) | ||
194 | #define SMC_outl(v, a, r) writel(v, (a) + (r)) | ||
195 | #define SMC_insl(a, r, p, l) readsl((a) + (r), p, l) | ||
196 | #define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l) | ||
197 | 191 | ||
198 | #include <asm/mach-types.h> | 192 | #include <asm/mach-types.h> |
199 | #include <asm/arch/cpu.h> | 193 | #include <asm/arch/cpu.h> |
@@ -367,6 +361,24 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r, | |||
367 | 361 | ||
368 | #define SMC_IRQ_FLAGS (0) | 362 | #define SMC_IRQ_FLAGS (0) |
369 | 363 | ||
364 | #elif defined(CONFIG_ARCH_VERSATILE) | ||
365 | |||
366 | #define SMC_CAN_USE_8BIT 1 | ||
367 | #define SMC_CAN_USE_16BIT 1 | ||
368 | #define SMC_CAN_USE_32BIT 1 | ||
369 | #define SMC_NOWAIT 1 | ||
370 | |||
371 | #define SMC_inb(a, r) readb((a) + (r)) | ||
372 | #define SMC_inw(a, r) readw((a) + (r)) | ||
373 | #define SMC_inl(a, r) readl((a) + (r)) | ||
374 | #define SMC_outb(v, a, r) writeb(v, (a) + (r)) | ||
375 | #define SMC_outw(v, a, r) writew(v, (a) + (r)) | ||
376 | #define SMC_outl(v, a, r) writel(v, (a) + (r)) | ||
377 | #define SMC_insl(a, r, p, l) readsl((a) + (r), p, l) | ||
378 | #define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l) | ||
379 | |||
380 | #define SMC_IRQ_FLAGS (0) | ||
381 | |||
370 | #else | 382 | #else |
371 | 383 | ||
372 | #define SMC_CAN_USE_8BIT 1 | 384 | #define SMC_CAN_USE_8BIT 1 |