diff options
Diffstat (limited to 'drivers/net/smc91x.h')
-rw-r--r-- | drivers/net/smc91x.h | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index ed9ae43523a1..912308eec865 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
@@ -44,6 +44,7 @@ | |||
44 | defined(CONFIG_MACH_MAINSTONE) ||\ | 44 | defined(CONFIG_MACH_MAINSTONE) ||\ |
45 | defined(CONFIG_MACH_ZYLONITE) ||\ | 45 | defined(CONFIG_MACH_ZYLONITE) ||\ |
46 | defined(CONFIG_MACH_LITTLETON) ||\ | 46 | defined(CONFIG_MACH_LITTLETON) ||\ |
47 | defined(CONFIG_MACH_ZYLONITE2) ||\ | ||
47 | defined(CONFIG_ARCH_VIPER) | 48 | defined(CONFIG_ARCH_VIPER) |
48 | 49 | ||
49 | #include <asm/mach-types.h> | 50 | #include <asm/mach-types.h> |
@@ -345,38 +346,6 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r, | |||
345 | #define RPC_LSA_DEFAULT RPC_LED_TX_RX | 346 | #define RPC_LSA_DEFAULT RPC_LED_TX_RX |
346 | #define RPC_LSB_DEFAULT RPC_LED_100_10 | 347 | #define RPC_LSB_DEFAULT RPC_LED_100_10 |
347 | 348 | ||
348 | #elif defined(CONFIG_SOC_AU1X00) | ||
349 | |||
350 | #include <au1xxx.h> | ||
351 | |||
352 | /* We can only do 16-bit reads and writes in the static memory space. */ | ||
353 | #define SMC_CAN_USE_8BIT 0 | ||
354 | #define SMC_CAN_USE_16BIT 1 | ||
355 | #define SMC_CAN_USE_32BIT 0 | ||
356 | #define SMC_IO_SHIFT 0 | ||
357 | #define SMC_NOWAIT 1 | ||
358 | |||
359 | #define SMC_inw(a, r) au_readw((unsigned long)((a) + (r))) | ||
360 | #define SMC_insw(a, r, p, l) \ | ||
361 | do { \ | ||
362 | unsigned long _a = (unsigned long)((a) + (r)); \ | ||
363 | int _l = (l); \ | ||
364 | u16 *_p = (u16 *)(p); \ | ||
365 | while (_l-- > 0) \ | ||
366 | *_p++ = au_readw(_a); \ | ||
367 | } while(0) | ||
368 | #define SMC_outw(v, a, r) au_writew(v, (unsigned long)((a) + (r))) | ||
369 | #define SMC_outsw(a, r, p, l) \ | ||
370 | do { \ | ||
371 | unsigned long _a = (unsigned long)((a) + (r)); \ | ||
372 | int _l = (l); \ | ||
373 | const u16 *_p = (const u16 *)(p); \ | ||
374 | while (_l-- > 0) \ | ||
375 | au_writew(*_p++ , _a); \ | ||
376 | } while(0) | ||
377 | |||
378 | #define SMC_IRQ_FLAGS (0) | ||
379 | |||
380 | #elif defined(CONFIG_ARCH_VERSATILE) | 349 | #elif defined(CONFIG_ARCH_VERSATILE) |
381 | 350 | ||
382 | #define SMC_CAN_USE_8BIT 1 | 351 | #define SMC_CAN_USE_8BIT 1 |
@@ -494,8 +463,6 @@ struct smc_local { | |||
494 | */ | 463 | */ |
495 | #include <linux/dma-mapping.h> | 464 | #include <linux/dma-mapping.h> |
496 | #include <mach/dma.h> | 465 | #include <mach/dma.h> |
497 | #include <mach/hardware.h> | ||
498 | #include <mach/pxa-regs.h> | ||
499 | 466 | ||
500 | #ifdef SMC_insl | 467 | #ifdef SMC_insl |
501 | #undef SMC_insl | 468 | #undef SMC_insl |