diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-06-14 12:56:50 -0700 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-12 03:41:10 -0700 |
commit | b544dbac41218fd015ac79455cfc1e57736e9b0c (patch) | |
tree | 6881af397456d0237dbb123ccb585a1a8086c166 /drivers/net/ethernet/ti | |
parent | s6gmac: Move the s6gmac drivers (diff) | |
download | linux-dev-b544dbac41218fd015ac79455cfc1e57736e9b0c.tar.xz linux-dev-b544dbac41218fd015ac79455cfc1e57736e9b0c.zip |
davinci*/tlan/cpmac: Move the Texas Instruments (TI) drivers
Move the Texas Instruments drivers to drivers/net/ethernet/ti/ and
make the necessary Kconfig and Makefile changes.
CC: Sriram <srk@ti.com>
CC: Vinay Hegde <vinay.hegde@ti.com>
CC: Cyril Chemparathy <cyril@ti.com>
CC: Samuel Chessman <chessman@tux.org>
CC: <torben.mathiasen@compaq.com>
CC: Eugene Konev <ejka@imfi.kspu.ru>
CC: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to '')
-rw-r--r-- | drivers/net/ethernet/ti/Kconfig | 76 | ||||
-rw-r--r-- | drivers/net/ethernet/ti/Makefile | 9 | ||||
-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 |
9 files changed, 85 insertions, 0 deletions
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 @@ +# +# TI device configuration +# + +config NET_VENDOR_TI + bool "Texas Instruments (TI) devices" + depends on PCI || EISA || AR7 || (ARM && (ARCH_DAVINCI || ARCH_OMAP3)) + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. + + Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about TI devices. If you say Y, you will be asked for + your specific card in the following questions. + +if NET_VENDOR_TI + +config TI_DAVINCI_EMAC + tristate "TI DaVinci EMAC Support" + depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 ) + select TI_DAVINCI_MDIO + select TI_DAVINCI_CPDMA + select PHYLIB + ---help--- + This driver supports TI's DaVinci Ethernet . + + To compile this driver as a module, choose M here: the module + will be called davinci_emac_driver. This is recommended. + +config TI_DAVINCI_MDIO + tristate "TI DaVinci MDIO Support" + depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 ) + select PHYLIB + ---help--- + This driver supports TI's DaVinci MDIO module. + + To compile this driver as a module, choose M here: the module + will be called davinci_mdio. This is recommended. + +config TI_DAVINCI_CPDMA + tristate "TI DaVinci CPDMA Support" + depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 ) + ---help--- + This driver supports TI's DaVinci CPDMA dma engine. + + To compile this driver as a module, choose M here: the module + will be called davinci_cpdma. This is recommended. + +config TLAN + tristate "TI ThunderLAN support" + depends on (PCI || EISA) + ---help--- + If you have a PCI Ethernet network card based on the ThunderLAN chip + which is supported by this driver, say Y and read the + Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. + + Devices currently supported by this driver are Compaq Netelligent, + Compaq NetFlex and Olicom cards. Please read the file + <file:Documentation/networking/tlan.txt> for more details. + + To compile this driver as a module, choose M here. The module + will be called tlan. + + Please email feedback to <torben.mathiasen@compaq.com>. + +config CPMAC + tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)" + depends on EXPERIMENTAL && AR7 + select PHYLIB + ---help--- + TI AR7 CPMAC Ethernet support + +endif # 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 @@ +# +# Makefile for the TI network device drivers. +# + +obj-$(CONFIG_TLAN) += tlan.o +obj-$(CONFIG_CPMAC) += cpmac.o +obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o +obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o +obj-$(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 |