aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Schmitz <schmitzmic@gmail.com>2015-01-15 08:06:15 -0500
committerDavid S. Miller <davem@davemloft.net>2015-01-15 19:32:58 -0500
commit6321b54a43e2dd3e2635f4a7cb7e4d83fd68dfe1 (patch)
treed4becccef0600d1b86239207e7a7691ef1f29fc0
parent27f097177defdd5858f03500e4b5aa8a97b1627b (diff)
net: smc91x: Add Atari EtherNAT support
Add Atari specific code to the smc91x Ethernet driver. This code is used on the EtherNAT adapter card for the Atari Falcon extension port. Signed-off-by: Michael Schmitz <schmitz@debian.org> Tested-by: Christian Steigies <cts@debian.org> [geert: Sort Kconfig entries, split in hard and soft dependencies] Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/smsc/Kconfig10
-rw-r--r--drivers/net/ethernet/smsc/smc91x.h21
2 files changed, 27 insertions, 4 deletions
diff --git a/drivers/net/ethernet/smsc/Kconfig b/drivers/net/ethernet/smsc/Kconfig
index 9468e64e6007..3e97a8b43147 100644
--- a/drivers/net/ethernet/smsc/Kconfig
+++ b/drivers/net/ethernet/smsc/Kconfig
@@ -5,8 +5,9 @@
5config NET_VENDOR_SMSC 5config NET_VENDOR_SMSC
6 bool "SMC (SMSC)/Western Digital devices" 6 bool "SMC (SMSC)/Western Digital devices"
7 default y 7 default y
8 depends on ARM || ISA || MAC || ARM64 || MIPS || M32R || SUPERH || \ 8 depends on ARM || ARM64 || ATARI_ETHERNAT || BLACKFIN || COLDFIRE || \
9 BLACKFIN || MN10300 || COLDFIRE || XTENSA || NIOS2 || PCI || PCMCIA 9 ISA || M32R || MAC || MIPS || MN10300 || NIOS2 || PCI || \
10 PCMCIA || SUPERH || XTENSA
10 ---help--- 11 ---help---
11 If you have a network (Ethernet) card belonging to this class, say Y 12 If you have a network (Ethernet) card belonging to this class, say Y
12 and read the Ethernet-HOWTO, available from 13 and read the Ethernet-HOWTO, available from
@@ -38,8 +39,9 @@ config SMC91X
38 tristate "SMC 91C9x/91C1xxx support" 39 tristate "SMC 91C9x/91C1xxx support"
39 select CRC32 40 select CRC32
40 select MII 41 select MII
41 depends on (ARM || M32R || SUPERH || MIPS || BLACKFIN || \ 42 depends on !OF || GPIOLIB
42 MN10300 || COLDFIRE || ARM64 || XTENSA || NIOS2) && (!OF || GPIOLIB) 43 depends on ARM || ARM64 || ATARI_ETHERNAT || BLACKFIN || COLDFIRE || \
44 M32R || MIPS || MN10300 || NIOS2 || SUPERH || XTENSA
43 ---help--- 45 ---help---
44 This is a driver for SMC's 91x series of Ethernet chipsets, 46 This is a driver for SMC's 91x series of Ethernet chipsets,
45 including the SMC91C94 and the SMC91C111. Say Y if you want it 47 including the SMC91C94 and the SMC91C111. Say Y if you want it
diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
index 2a38dacbbd27..be67baf5f677 100644
--- a/drivers/net/ethernet/smsc/smc91x.h
+++ b/drivers/net/ethernet/smsc/smc91x.h
@@ -216,6 +216,27 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
216 216
217#include <unit/smc91111.h> 217#include <unit/smc91111.h>
218 218
219#elif defined(CONFIG_ATARI)
220
221#define SMC_CAN_USE_8BIT 1
222#define SMC_CAN_USE_16BIT 1
223#define SMC_CAN_USE_32BIT 1
224#define SMC_NOWAIT 1
225
226#define SMC_inb(a, r) readb((a) + (r))
227#define SMC_inw(a, r) readw((a) + (r))
228#define SMC_inl(a, r) readl((a) + (r))
229#define SMC_outb(v, a, r) writeb(v, (a) + (r))
230#define SMC_outw(v, a, r) writew(v, (a) + (r))
231#define SMC_outl(v, a, r) writel(v, (a) + (r))
232#define SMC_insw(a, r, p, l) readsw((a) + (r), p, l)
233#define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l)
234#define SMC_insl(a, r, p, l) readsl((a) + (r), p, l)
235#define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l)
236
237#define RPC_LSA_DEFAULT RPC_LED_100_10
238#define RPC_LSB_DEFAULT RPC_LED_TX_RX
239
219#elif defined(CONFIG_ARCH_MSM) 240#elif defined(CONFIG_ARCH_MSM)
220 241
221#define SMC_CAN_USE_8BIT 0 242#define SMC_CAN_USE_8BIT 0