aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/Kconfig56
-rw-r--r--drivers/net/Makefile7
-rw-r--r--drivers/net/ethernet/Kconfig1
-rw-r--r--drivers/net/ethernet/Makefile1
-rw-r--r--drivers/net/ethernet/ti/Kconfig76
-rw-r--r--drivers/net/ethernet/ti/Makefile9
-rw-r--r--drivers/net/ethernet/ti/cpmac.c (renamed from drivers/net/cpmac.c)0
-rw-r--r--drivers/net/ethernet/ti/davinci_cpdma.c (renamed from drivers/net/davinci_cpdma.c)0
-rw-r--r--drivers/net/ethernet/ti/davinci_cpdma.h (renamed from drivers/net/davinci_cpdma.h)0
-rw-r--r--drivers/net/ethernet/ti/davinci_emac.c (renamed from drivers/net/davinci_emac.c)0
-rw-r--r--drivers/net/ethernet/ti/davinci_mdio.c (renamed from drivers/net/davinci_mdio.c)0
-rw-r--r--drivers/net/ethernet/ti/tlan.c (renamed from drivers/net/tlan.c)0
-rw-r--r--drivers/net/ethernet/ti/tlan.h (renamed from drivers/net/tlan.h)0
13 files changed, 87 insertions, 63 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 134c3a4ff423..e8d65fe015a2 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -323,37 +323,6 @@ config NET_NETX
323 To compile this driver as a module, choose M here. The module 323 To compile this driver as a module, choose M here. The module
324 will be called netx-eth. 324 will be called netx-eth.
325 325
326config TI_DAVINCI_EMAC
327 tristate "TI DaVinci EMAC Support"
328 depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
329 select TI_DAVINCI_MDIO
330 select TI_DAVINCI_CPDMA
331 select PHYLIB
332 help
333 This driver supports TI's DaVinci Ethernet .
334
335 To compile this driver as a module, choose M here: the module
336 will be called davinci_emac_driver. This is recommended.
337
338config TI_DAVINCI_MDIO
339 tristate "TI DaVinci MDIO Support"
340 depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
341 select PHYLIB
342 help
343 This driver supports TI's DaVinci MDIO module.
344
345 To compile this driver as a module, choose M here: the module
346 will be called davinci_mdio. This is recommended.
347
348config TI_DAVINCI_CPDMA
349 tristate "TI DaVinci CPDMA Support"
350 depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
351 help
352 This driver supports TI's DaVinci CPDMA dma engine.
353
354 To compile this driver as a module, choose M here: the module
355 will be called davinci_cpdma. This is recommended.
356
357config DM9000 326config DM9000
358 tristate "DM9000 support" 327 tristate "DM9000 support"
359 depends on ARM || BLACKFIN || MIPS 328 depends on ARM || BLACKFIN || MIPS
@@ -500,31 +469,6 @@ config R6040
500 To compile this driver as a module, choose M here: the module 469 To compile this driver as a module, choose M here: the module
501 will be called r6040. This is recommended. 470 will be called r6040. This is recommended.
502 471
503config TLAN
504 tristate "TI ThunderLAN support"
505 depends on NET_PCI && (PCI || EISA)
506 ---help---
507 If you have a PCI Ethernet network card based on the ThunderLAN chip
508 which is supported by this driver, say Y and read the
509 Ethernet-HOWTO, available from
510 <http://www.tldp.org/docs.html#howto>.
511
512 Devices currently supported by this driver are Compaq Netelligent,
513 Compaq NetFlex and Olicom cards. Please read the file
514 <file:Documentation/networking/tlan.txt> for more details.
515
516 To compile this driver as a module, choose M here. The module
517 will be called tlan.
518
519 Please email feedback to <torben.mathiasen@compaq.com>.
520
521config CPMAC
522 tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
523 depends on NET_ETHERNET && EXPERIMENTAL && AR7
524 select PHYLIB
525 help
526 TI AR7 CPMAC Ethernet support
527
528config NET_POCKET 472config NET_POCKET
529 bool "Pocket and portable adapters" 473 bool "Pocket and portable adapters"
530 depends on PARPORT 474 depends on PARPORT
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 938484f8a467..96112ddfb9bb 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -5,11 +5,6 @@
5obj-$(CONFIG_MII) += mii.o 5obj-$(CONFIG_MII) += mii.o
6obj-$(CONFIG_MDIO) += mdio.o 6obj-$(CONFIG_MDIO) += mdio.o
7obj-$(CONFIG_PHYLIB) += phy/ 7obj-$(CONFIG_PHYLIB) += phy/
8
9obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
10obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o
11obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o
12
13obj-$(CONFIG_IP1000) += ipg.o 8obj-$(CONFIG_IP1000) += ipg.o
14obj-$(CONFIG_CAN) += can/ 9obj-$(CONFIG_CAN) += can/
15obj-$(CONFIG_BONDING) += bonding/ 10obj-$(CONFIG_BONDING) += bonding/
@@ -23,7 +18,6 @@ obj-$(CONFIG_PLIP) += plip.o
23 18
24obj-$(CONFIG_ROADRUNNER) += rrunner.o 19obj-$(CONFIG_ROADRUNNER) += rrunner.o
25 20
26obj-$(CONFIG_TLAN) += tlan.o
27obj-$(CONFIG_R6040) += r6040.o 21obj-$(CONFIG_R6040) += r6040.o
28obj-$(CONFIG_YELLOWFIN) += yellowfin.o 22obj-$(CONFIG_YELLOWFIN) += yellowfin.o
29obj-$(CONFIG_FEALNX) += fealnx.o 23obj-$(CONFIG_FEALNX) += fealnx.o
@@ -67,7 +61,6 @@ obj-$(CONFIG_IFB) += ifb.o
67obj-$(CONFIG_MACVLAN) += macvlan.o 61obj-$(CONFIG_MACVLAN) += macvlan.o
68obj-$(CONFIG_MACVTAP) += macvtap.o 62obj-$(CONFIG_MACVTAP) += macvtap.o
69obj-$(CONFIG_DEFXX) += defxx.o 63obj-$(CONFIG_DEFXX) += defxx.o
70obj-$(CONFIG_CPMAC) += cpmac.o
71obj-$(CONFIG_EQUALIZER) += eql.o 64obj-$(CONFIG_EQUALIZER) += eql.o
72obj-$(CONFIG_KORINA) += korina.o 65obj-$(CONFIG_KORINA) += korina.o
73obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o 66obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index f53a4bc53ddb..3983e702b97a 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -63,6 +63,7 @@ source "drivers/net/ethernet/smsc/Kconfig"
63source "drivers/net/ethernet/stmicro/Kconfig" 63source "drivers/net/ethernet/stmicro/Kconfig"
64source "drivers/net/ethernet/sun/Kconfig" 64source "drivers/net/ethernet/sun/Kconfig"
65source "drivers/net/ethernet/tehuti/Kconfig" 65source "drivers/net/ethernet/tehuti/Kconfig"
66source "drivers/net/ethernet/ti/Kconfig"
66source "drivers/net/ethernet/toshiba/Kconfig" 67source "drivers/net/ethernet/toshiba/Kconfig"
67source "drivers/net/ethernet/tundra/Kconfig" 68source "drivers/net/ethernet/tundra/Kconfig"
68source "drivers/net/ethernet/via/Kconfig" 69source "drivers/net/ethernet/via/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 4491d8491adb..873d27591466 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -43,6 +43,7 @@ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
43obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/ 43obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
44obj-$(CONFIG_NET_VENDOR_SUN) += sun/ 44obj-$(CONFIG_NET_VENDOR_SUN) += sun/
45obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/ 45obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/
46obj-$(CONFIG_NET_VENDOR_TI) += ti/
46obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/ 47obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/
47obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/ 48obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/
48obj-$(CONFIG_NET_VENDOR_VIA) += via/ 49obj-$(CONFIG_NET_VENDOR_VIA) += via/
diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig
new file mode 100644
index 000000000000..1284319ba7e0
--- /dev/null
+++ b/drivers/net/ethernet/ti/Kconfig
@@ -0,0 +1,76 @@
1#
2# TI device configuration
3#
4
5config NET_VENDOR_TI
6 bool "Texas Instruments (TI) devices"
7 depends on PCI || EISA || AR7 || (ARM && (ARCH_DAVINCI || ARCH_OMAP3))
8 ---help---
9 If you have a network (Ethernet) card belonging to this class, say Y
10 and read the Ethernet-HOWTO, available from
11 <http://www.tldp.org/docs.html#howto>.
12
13 Note that the answer to this question doesn't directly affect the
14 kernel: saying N will just cause the configurator to skip all
15 the questions about TI devices. If you say Y, you will be asked for
16 your specific card in the following questions.
17
18if NET_VENDOR_TI
19
20config TI_DAVINCI_EMAC
21 tristate "TI DaVinci EMAC Support"
22 depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
23 select TI_DAVINCI_MDIO
24 select TI_DAVINCI_CPDMA
25 select PHYLIB
26 ---help---
27 This driver supports TI's DaVinci Ethernet .
28
29 To compile this driver as a module, choose M here: the module
30 will be called davinci_emac_driver. This is recommended.
31
32config TI_DAVINCI_MDIO
33 tristate "TI DaVinci MDIO Support"
34 depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
35 select PHYLIB
36 ---help---
37 This driver supports TI's DaVinci MDIO module.
38
39 To compile this driver as a module, choose M here: the module
40 will be called davinci_mdio. This is recommended.
41
42config TI_DAVINCI_CPDMA
43 tristate "TI DaVinci CPDMA Support"
44 depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
45 ---help---
46 This driver supports TI's DaVinci CPDMA dma engine.
47
48 To compile this driver as a module, choose M here: the module
49 will be called davinci_cpdma. This is recommended.
50
51config TLAN
52 tristate "TI ThunderLAN support"
53 depends on (PCI || EISA)
54 ---help---
55 If you have a PCI Ethernet network card based on the ThunderLAN chip
56 which is supported by this driver, say Y and read the
57 Ethernet-HOWTO, available from
58 <http://www.tldp.org/docs.html#howto>.
59
60 Devices currently supported by this driver are Compaq Netelligent,
61 Compaq NetFlex and Olicom cards. Please read the file
62 <file:Documentation/networking/tlan.txt> for more details.
63
64 To compile this driver as a module, choose M here. The module
65 will be called tlan.
66
67 Please email feedback to <torben.mathiasen@compaq.com>.
68
69config CPMAC
70 tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
71 depends on EXPERIMENTAL && AR7
72 select PHYLIB
73 ---help---
74 TI AR7 CPMAC Ethernet support
75
76endif # NET_VENDOR_TI
diff --git a/drivers/net/ethernet/ti/Makefile b/drivers/net/ethernet/ti/Makefile
new file mode 100644
index 000000000000..aedb3af74e5a
--- /dev/null
+++ b/drivers/net/ethernet/ti/Makefile
@@ -0,0 +1,9 @@
1#
2# Makefile for the TI network device drivers.
3#
4
5obj-$(CONFIG_TLAN) += tlan.o
6obj-$(CONFIG_CPMAC) += cpmac.o
7obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
8obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o
9obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o
diff --git a/drivers/net/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
index e0638cb4b07c..e0638cb4b07c 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/ethernet/ti/cpmac.c
diff --git a/drivers/net/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
index dca9d3369cdd..dca9d3369cdd 100644
--- a/drivers/net/davinci_cpdma.c
+++ b/drivers/net/ethernet/ti/davinci_cpdma.c
diff --git a/drivers/net/davinci_cpdma.h b/drivers/net/ethernet/ti/davinci_cpdma.h
index afa19a0c0d81..afa19a0c0d81 100644
--- a/drivers/net/davinci_cpdma.h
+++ b/drivers/net/ethernet/ti/davinci_cpdma.h
diff --git a/drivers/net/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 3f451e4d8361..3f451e4d8361 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
diff --git a/drivers/net/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c
index 7615040df756..7615040df756 100644
--- a/drivers/net/davinci_mdio.c
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
diff --git a/drivers/net/tlan.c b/drivers/net/ethernet/ti/tlan.c
index 145871b3130b..145871b3130b 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/ethernet/ti/tlan.c
diff --git a/drivers/net/tlan.h b/drivers/net/ethernet/ti/tlan.h
index 5fc98a8e4889..5fc98a8e4889 100644
--- a/drivers/net/tlan.h
+++ b/drivers/net/ethernet/ti/tlan.h
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-19 06:19:32 -0500