dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

smsc: Move the SMC (SMSC) drivers 

Moves the SMC (SMSC) drivers into drivers/net/ethernet/smsc/ and the
necessary Kconfig and Makefile changes.  Also did some cleanup
of NET_VENDOR_SMC Kconfig tag for the 8390 based drivers.

CC: Nicolas Pitre <nico@fluxnic.net>
CC: Donald Becker <becker@scyld.com>
CC: Erik Stahlman <erik@vt.edu>
CC: Dustin McIntire <dustin@sensoria.com>
CC: Steve Glendinning <steve.glendinning@smsc.com>
CC: David Hinds <dahinds@users.sourceforge.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Jeff Kirsher 2011-05-12 20:21:07 -07:00
parent aa43c2158d
commit ae150435b5
22 changed files with 151 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MAINTAINERS
View File

@ -5869,7 +5869,7 @@ F: mm/sl?b.c
SMC91x ETHERNET DRIVER
M: Nicolas Pitre <nico@fluxnic.net>
S: Odd Fixes
F: drivers/net/smc91x.*
F: drivers/net/ethernet/smsc/smc91x.*
SMM665 HARDWARE MONITOR DRIVER
M: Guenter Roeck <linux@roeck-us.net>
@ -5904,13 +5904,13 @@ M: Steve Glendinning <steve.glendinning@smsc.com>
L: netdev@vger.kernel.org
S: Supported
F: include/linux/smsc911x.h
F: drivers/net/smsc911x.*
F: drivers/net/ethernet/smsc/smsc911x.*
SMSC9420 PCI ETHERNET DRIVER
M: Steve Glendinning <steve.glendinning@smsc.com>
L: netdev@vger.kernel.org
S: Supported
F: drivers/net/smsc9420.*
F: drivers/net/ethernet/smsc/smsc9420.*
SN-IA64 (Itanium) SUB-PLATFORM
M: Jes Sorensen <jes@sgi.com>

105
drivers/net/Kconfig
View File

@ -565,39 +565,6 @@ config BFIN_MAC_USE_HWSTAMP
help
To support the IEEE 1588 Precision Time Protocol (PTP), select y here
config SMC9194
tristate "SMC 9194 support"
depends on NET_VENDOR_SMC && (ISA || MAC && BROKEN)
select CRC32
---help---
This is support for the SMC9xxx based Ethernet cards. Choose this
option if you have a DELL laptop with the docking station, or
another SMC9192/9194 based chipset. Say Y if you want it compiled
into the kernel, and read the file
<file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
available from <http://www.tldp.org/docs.html#howto>.
To compile this driver as a module, choose M here. The module
will be called smc9194.
config SMC91X
tristate "SMC 91C9x/91C1xxx support"
select CRC32
select MII
depends on ARM || M32R || SUPERH || \
MIPS || BLACKFIN || MN10300 || COLDFIRE
help
This is a driver for SMC's 91x series of Ethernet chipsets,
including the SMC91C94 and the SMC91C111. Say Y if you want it
compiled into the kernel, and read the file
<file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
available from <http://www.tldp.org/docs.html#howto>.
This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will be called smc91x. If you want to compile it as a
module, say M here and read <file:Documentation/kbuild/modules.txt>.
config PXA168_ETH
tristate "Marvell pxa168 ethernet support"
depends on CPU_PXA168
@ -712,44 +679,6 @@ config GRETH
help
Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.
config SMC911X
tristate "SMSC LAN911[5678] support"
select CRC32
select MII
depends on ARM || SUPERH || MN10300
help
This is a driver for SMSC's LAN911x series of Ethernet chipsets
including the new LAN9115, LAN9116, LAN9117, and LAN9118.
Say Y if you want it compiled into the kernel,
and read the Ethernet-HOWTO, available from
<http://www.tldp.org/docs.html#howto>.
This driver is also available as a module. The module will be
called smc911x. If you want to compile it as a module, say M
here and read <file:Documentation/kbuild/modules.txt>
config SMSC911X
tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
depends on ARM || SUPERH || BLACKFIN || MIPS || MN10300
select CRC32
select MII
select PHYLIB
---help---
Say Y here if you want support for SMSC LAN911x and LAN921x families
of ethernet controllers.
To compile this driver as a module, choose M here and read
<file:Documentation/networking/net-modules.txt>. The module
will be called smsc911x.
config SMSC911X_ARCH_HOOKS
def_bool n
depends on SMSC911X
help
If the arch enables this, it allows the arch to implement various
hooks for more comprehensive interrupt control and also to override
the source of the MAC address.
config NET_VENDOR_RACAL
bool "Racal-Interlan (Micom) NI cards"
depends on ISA
@ -1148,33 +1077,6 @@ config SIS900
To compile this driver as a module, choose M here: the module
will be called sis900. This is recommended.
config EPIC100
tristate "SMC EtherPower II"
depends on NET_PCI && PCI
select CRC32
select MII
help
This driver is for the SMC EtherPower II 9432 PCI Ethernet NIC,
which is based on the SMC83c17x (EPIC/100).
More specific information and updates are available from
<http://www.scyld.com/network/epic100.html>.
config SMSC9420
tristate "SMSC LAN9420 PCI ethernet adapter support"
depends on NET_PCI && PCI
select CRC32
select PHYLIB
select SMSC_PHY
help
This is a driver for SMSC's LAN9420 PCI ethernet adapter.
Say Y if you want it compiled into the kernel,
and read the Ethernet-HOWTO, available from
<http://www.tldp.org/docs.html#howto>.
This driver is also available as a module. The module will be
called smsc9420. If you want to compile it as a module, say M
here and read <file:Documentation/kbuild/modules.txt>
config SUNDANCE
tristate "Sundance Alta support"
depends on NET_PCI && PCI
@ -1891,13 +1793,6 @@ config MYRI10GE_DCA
driver. DCA is a method for warming the CPU cache before data
is used, with the intent of lessening the impact of cache misses.
config NETXEN_NIC
tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
depends on PCI
select FW_LOADER
help
This enables the support for NetXen's Gigabit Ethernet card.
config NIU
tristate "Sun Neptune 10Gbit Ethernet support"
depends on PCI

7
drivers/net/Makefile
View File

@ -55,8 +55,6 @@ obj-$(CONFIG_MACE) += mace.o
obj-$(CONFIG_BMAC) += bmac.o
obj-$(CONFIG_TLAN) += tlan.o
obj-$(CONFIG_EPIC100) += epic100.o
obj-$(CONFIG_SMSC9420) += smsc9420.o
obj-$(CONFIG_SIS190) += sis190.o
obj-$(CONFIG_SIS900) += sis900.o
obj-$(CONFIG_R6040) += r6040.o
@ -95,7 +93,6 @@ obj-$(CONFIG_NET) += Space.o loopback.o
obj-$(CONFIG_SEEQ8005) += seeq8005.o
obj-$(CONFIG_NET_SB1000) += sb1000.o
obj-$(CONFIG_HP100) += hp100.o
obj-$(CONFIG_SMC9194) += smc9194.o
obj-$(CONFIG_FEC) += fec.o
obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o
ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
@ -182,9 +179,6 @@ obj-$(CONFIG_IBMVETH) += ibmveth.o
obj-$(CONFIG_S2IO) += s2io.o
obj-$(CONFIG_VXGE) += vxge/
obj-$(CONFIG_MYRI10GE) += myri10ge/
obj-$(CONFIG_SMC91X) += smc91x.o
obj-$(CONFIG_SMC911X) += smc911x.o
obj-$(CONFIG_SMSC911X) += smsc911x.o
obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
obj-$(CONFIG_DM9000) += dm9000.o
@ -231,7 +225,6 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o
obj-$(CONFIG_FS_ENET) += fs_enet/
obj-$(CONFIG_NETXEN_NIC) += netxen/
obj-$(CONFIG_NIU) += niu.o
obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
obj-$(CONFIG_SFC) += sfc/

21
drivers/net/ethernet/8390/Kconfig
View File

@ -264,22 +264,9 @@ config STNIC
If unsure, say N.
config NET_VENDOR_SMC
bool "Western Digital/SMC cards"
depends on (ISA || MCA || EISA || MAC)
---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 Western Digital cards. If you say Y, you will be
asked for your specific card in the following questions.
config ULTRAMCA
tristate "SMC Ultra MCA support"
depends on NET_VENDOR_SMC && MCA
depends on MCA
select CRC32
---help---
If you have a network (Ethernet) card of this type and are running
@ -291,7 +278,7 @@ config ULTRAMCA
config ULTRA
tristate "SMC Ultra support"
depends on NET_VENDOR_SMC && ISA
depends on ISA
select CRC32
---help---
If you have a network (Ethernet) card of this type, say Y and read
@ -310,7 +297,7 @@ config ULTRA
config ULTRA32
tristate "SMC Ultra32 EISA support"
depends on NET_VENDOR_SMC && EISA
depends on EISA
select CRC32
---help---
If you have a network (Ethernet) card of this type, say Y and read
@ -322,7 +309,7 @@ config ULTRA32
config WD80x3
tristate "WD80*3 support"
depends on NET_VENDOR_SMC && ISA
depends on ISA
select CRC32
---help---
If you have a network (Ethernet) card of this type, say Y and read

1
drivers/net/ethernet/Kconfig
View File

@ -18,5 +18,6 @@ source "drivers/net/ethernet/broadcom/Kconfig"
source "drivers/net/ethernet/chelsio/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/smsc/Kconfig"
endif # ETHERNET

1
drivers/net/ethernet/Makefile
View File

@ -9,3 +9,4 @@ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/

131
drivers/net/ethernet/smsc/Kconfig Normal file
View File

@ -0,0 +1,131 @@
#
# Western Digital/SMC network device configuration
#
config NET_VENDOR_SMSC
bool "SMC (SMSC)/Western Digital devices"
depends on ARM || ISA || MAC || ARM || MIPS || M32R || SUPERH || \
BLACKFIN || MN10300 || COLDFIRE || PCI || PCMCIA
---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 SMC/Western Digital cards. If you say Y, you will
be asked for your specific card in the following questions.
if NET_VENDOR_SMSC
config SMC9194
tristate "SMC 9194 support"
depends on (ISA || MAC && BROKEN)
select CRC32
---help---
This is support for the SMC9xxx based Ethernet cards. Choose this
option if you have a DELL laptop with the docking station, or
another SMC9192/9194 based chipset. Say Y if you want it compiled
into the kernel, and read the file
<file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
available from <http://www.tldp.org/docs.html#howto>.
To compile this driver as a module, choose M here. The module
will be called smc9194.
config SMC91X
tristate "SMC 91C9x/91C1xxx support"
select CRC32
select MII
depends on (ARM || M32R || SUPERH || MIPS || BLACKFIN || \
MN10300 || COLDFIRE)
---help---
This is a driver for SMC's 91x series of Ethernet chipsets,
including the SMC91C94 and the SMC91C111. Say Y if you want it
compiled into the kernel, and read the file
<file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
available from <http://www.tldp.org/docs.html#howto>.
This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will be called smc91x. If you want to compile it as a
module, say M here and read <file:Documentation/kbuild/modules.txt>.
config PCMCIA_SMC91C92
tristate "SMC 91Cxx PCMCIA support"
depends on PCMCIA
select CRC32
select MII
---help---
Say Y here if you intend to attach an SMC 91Cxx compatible PCMCIA
(PC-card) Ethernet or Fast Ethernet card to your computer.
To compile this driver as a module, choose M here: the module will be
called smc91c92_cs. If unsure, say N.
config EPIC100
tristate "SMC EtherPower II"
depends on PCI
select CRC32
select MII
---help---
This driver is for the SMC EtherPower II 9432 PCI Ethernet NIC,
which is based on the SMC83c17x (EPIC/100).
More specific information and updates are available from
<http://www.scyld.com/network/epic100.html>.
config SMC911X
tristate "SMSC LAN911[5678] support"
select CRC32
select MII
depends on (ARM || SUPERH || MN10300)
---help---
This is a driver for SMSC's LAN911x series of Ethernet chipsets
including the new LAN9115, LAN9116, LAN9117, and LAN9118.
Say Y if you want it compiled into the kernel,
and read the Ethernet-HOWTO, available from
<http://www.tldp.org/docs.html#howto>.
This driver is also available as a module. The module will be
called smc911x. If you want to compile it as a module, say M
here and read <file:Documentation/kbuild/modules.txt>
config SMSC911X
tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
depends on (ARM || SUPERH || BLACKFIN || MIPS || MN10300)
select CRC32
select MII
select PHYLIB
---help---
Say Y here if you want support for SMSC LAN911x and LAN921x families
of ethernet controllers.
To compile this driver as a module, choose M here and read
<file:Documentation/networking/net-modules.txt>. The module
will be called smsc911x.
config SMSC911X_ARCH_HOOKS
def_bool n
depends on SMSC911X
---help---
If the arch enables this, it allows the arch to implement various
hooks for more comprehensive interrupt control and also to override
the source of the MAC address.
config SMSC9420
tristate "SMSC LAN9420 PCI ethernet adapter support"
depends on PCI
select CRC32
select PHYLIB
select SMSC_PHY
---help---
This is a driver for SMSC's LAN9420 PCI ethernet adapter.
Say Y if you want it compiled into the kernel,
and read the Ethernet-HOWTO, available from
<http://www.tldp.org/docs.html#howto>.
This driver is also available as a module. The module will be
called smsc9420. If you want to compile it as a module, say M
here and read <file:Documentation/kbuild/modules.txt>
endif # NET_VENDOR_SMSC

11
drivers/net/ethernet/smsc/Makefile Normal file
View File

@ -0,0 +1,11 @@
#
# Makefile for the SMSC network device drivers.
#
obj-$(CONFIG_SMC9194) += smc9194.o
obj-$(CONFIG_SMC91X) += smc91x.o
obj-$(CONFIG_PCMCIA_SMC91C92) += smc91c92_cs.o
obj-$(CONFIG_EPIC100) += epic100.o
obj-$(CONFIG_SMSC9420) += smsc9420.o
obj-$(CONFIG_SMC911X) += smc911x.o
obj-$(CONFIG_SMSC911X) += smsc911x.o

0
drivers/net/epic100.c → drivers/net/ethernet/smsc/epic100.c
View File

0
drivers/net/smc911x.c → drivers/net/ethernet/smsc/smc911x.c
View File

0
drivers/net/smc911x.h → drivers/net/ethernet/smsc/smc911x.h
View File

0
drivers/net/smc9194.c → drivers/net/ethernet/smsc/smc9194.c
View File

0
drivers/net/smc9194.h → drivers/net/ethernet/smsc/smc9194.h
View File

0
drivers/net/pcmcia/smc91c92_cs.c → drivers/net/ethernet/smsc/smc91c92_cs.c
View File

0
drivers/net/smc91x.c → drivers/net/ethernet/smsc/smc91x.c
View File

0
drivers/net/smc91x.h → drivers/net/ethernet/smsc/smc91x.h
View File

0
drivers/net/smsc911x.c → drivers/net/ethernet/smsc/smsc911x.c
View File

0
drivers/net/smsc911x.h → drivers/net/ethernet/smsc/smsc911x.h
View File

0
drivers/net/smsc9420.c → drivers/net/ethernet/smsc/smsc9420.c
View File

0
drivers/net/smsc9420.h → drivers/net/ethernet/smsc/smsc9420.h
View File

11
drivers/net/pcmcia/Kconfig
View File

@ -31,17 +31,6 @@ config PCMCIA_FMVJ18X
To compile this driver as a module, choose M here: the module will be
called fmvj18x_cs. If unsure, say N.
config PCMCIA_SMC91C92
tristate "SMC 91Cxx PCMCIA support"
select CRC32
select MII
help
Say Y here if you intend to attach an SMC 91Cxx compatible PCMCIA
(PC-card) Ethernet or Fast Ethernet card to your computer.
To compile this driver as a module, choose M here: the module will be
called smc91c92_cs. If unsure, say N.
config PCMCIA_XIRC2PS
tristate "Xircom 16-bit PCMCIA support"
help

1
drivers/net/pcmcia/Makefile
View File

@ -4,7 +4,6 @@
# 16-bit client drivers
obj-$(CONFIG_PCMCIA_FMVJ18X) += fmvj18x_cs.o
obj-$(CONFIG_PCMCIA_SMC91C92) += smc91c92_cs.o
obj-$(CONFIG_PCMCIA_XIRC2PS) += xirc2ps_cs.o
obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o