diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index b645a73fd21274e0ee2024a2f88ce137ea28f518..a6edd3546fe92839ed7cd6d4499e420220510cee 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -467,17 +467,6 @@ config ADAPTEC_STARFIRE To compile this driver as a module, choose M here: the module will be called starfire. This is recommended. -config KSZ884X_PCI - tristate "Micrel KSZ8841/2 PCI" - depends on NET_PCI && PCI - select MII - select CRC32 - help - This PCI driver is for Micrel KSZ8841/KSZ8842 PCI Ethernet chip. - - To compile this driver as a module, choose M here. The module - will be called ksz884x. - config FORCEDETH tristate "nForce Ethernet support" depends on NET_PCI && PCI @@ -550,30 +539,6 @@ config TLAN Please email feedback to <torben.mathiasen@compaq.com>. -config KS8842 - tristate "Micrel KSZ8841/42 with generic bus interface" - depends on HAS_IOMEM && DMA_ENGINE - help - This platform driver is for KSZ8841(1-port) / KS8842(2-port) - ethernet switch chip (managed, VLAN, QoS) from Micrel or - Timberdale(FPGA). - -config KS8851 - tristate "Micrel KS8851 SPI" - depends on SPI - select MII - select CRC32 - help - SPI driver for Micrel KS8851 SPI attached network chip. - -config KS8851_MLL - tristate "Micrel KS8851 MLL" - depends on HAS_IOMEM - select MII - help - This platform driver is for Micrel KS8851 Address/data bus - multiplexed network chip. - config CPMAC tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)" depends on NET_ETHERNET && EXPERIMENTAL && AR7 diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 39fe73033a029c2e736fa1540a764cafb52efd83..e448e6ed5918f5ce22b820ef421e151c525b6822 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -36,10 +36,6 @@ gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y) obj-$(CONFIG_TC35815) += tc35815.o obj-$(CONFIG_SKFP) += skfp/ -obj-$(CONFIG_KS8842) += ks8842.o -obj-$(CONFIG_KS8851) += ks8851.o -obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o -obj-$(CONFIG_KSZ884X_PCI) += ksz884x.o obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o obj-$(CONFIG_RIONET) += rionet.o obj-$(CONFIG_SH_ETH) += sh_eth.o diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig index b6f7302ccc64b0de633972f3749e6d26fa9ffce2..4f748ccdefe2497176f01cdcdbf788fbf0d56e34 100644 --- a/drivers/net/arm/Kconfig +++ b/drivers/net/arm/Kconfig @@ -11,14 +11,6 @@ config ARM_AT91_ETHER If you wish to compile a kernel for the AT91RM9200 and enable ethernet support, then you should always answer Y to this. -config ARM_KS8695_ETHER - tristate "KS8695 Ethernet support" - depends on ARM && ARCH_KS8695 - select MII - help - If you wish to compile a kernel for the KS8695 and want to - use the internal ethernet then you should answer Y to this. - config EP93XX_ETH tristate "EP93xx Ethernet support" depends on ARM && ARCH_EP93XX diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile index a2532e6d7df5f6d5d8ed982bd40feac896b0f46a..316b06c94af57a753a63b206ecc0ac3c22ee1cb0 100644 --- a/drivers/net/arm/Makefile +++ b/drivers/net/arm/Makefile @@ -4,6 +4,5 @@ # obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o -obj-$(CONFIG_ARM_KS8695_ETHER) += ks8695net.o obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o obj-$(CONFIG_W90P910_ETH) += w90p910_ether.o diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 924c287aaaa9720b89ff7a345958f16848f00526..d90f47f3b78287dab12c15c2be780ee12c68b701 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -32,6 +32,7 @@ source "drivers/net/ethernet/i825xx/Kconfig" source "drivers/net/ethernet/xscale/Kconfig" source "drivers/net/ethernet/marvell/Kconfig" source "drivers/net/ethernet/mellanox/Kconfig" +source "drivers/net/ethernet/micrel/Kconfig" source "drivers/net/ethernet/myricom/Kconfig" source "drivers/net/ethernet/natsemi/Kconfig" source "drivers/net/ethernet/8390/Kconfig" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 025d7b763b91339088032352902c35937ec5d4d4..cf27ae0eb3ecea9b80cb59ccb10ecba7cb0513c3 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -24,6 +24,7 @@ obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/ obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/ obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ +obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/ obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/ obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/ obj-$(CONFIG_NET_VENDOR_OKI) += oki-semi/ diff --git a/drivers/net/ethernet/micrel/Kconfig b/drivers/net/ethernet/micrel/Kconfig new file mode 100644 index 0000000000000000000000000000000000000000..4227de6d11f263d718ade45c898afd408c3ccf56 --- /dev/null +++ b/drivers/net/ethernet/micrel/Kconfig @@ -0,0 +1,64 @@ +# +# Micrel device configuration +# + +config NET_VENDOR_MICREL + bool "Micrel devices" + depends on (HAS_IOMEM && DMA_ENGINE) || SPI || PCI || HAS_IOMEM || \ + (ARM && ARCH_KS8695) + ---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 Micrel devices. If you say Y, you will be asked + for your specific card in the following questions. + +if NET_VENDOR_MICREL + +config ARM_KS8695_ETHER + tristate "KS8695 Ethernet support" + depends on ARM && ARCH_KS8695 + select MII + ---help--- + If you wish to compile a kernel for the KS8695 and want to + use the internal ethernet then you should answer Y to this. + +config KS8842 + tristate "Micrel KSZ8841/42 with generic bus interface" + depends on HAS_IOMEM && DMA_ENGINE + ---help--- + This platform driver is for KSZ8841(1-port) / KS8842(2-port) + ethernet switch chip (managed, VLAN, QoS) from Micrel or + Timberdale(FPGA). + +config KS8851 + tristate "Micrel KS8851 SPI" + depends on SPI + select MII + select CRC32 + ---help--- + SPI driver for Micrel KS8851 SPI attached network chip. + +config KS8851_MLL + tristate "Micrel KS8851 MLL" + depends on HAS_IOMEM + select MII + ---help--- + This platform driver is for Micrel KS8851 Address/data bus + multiplexed network chip. + +config KSZ884X_PCI + tristate "Micrel KSZ8841/2 PCI" + depends on PCI + select MII + select CRC32 + ---help--- + This PCI driver is for Micrel KSZ8841/KSZ8842 PCI Ethernet chip. + + To compile this driver as a module, choose M here. The module + will be called ksz884x. + +endif # NET_VENDOR_MICREL diff --git a/drivers/net/ethernet/micrel/Makefile b/drivers/net/ethernet/micrel/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..c83e4bc50c73fcced65a4f3f0ce83835d23442dd --- /dev/null +++ b/drivers/net/ethernet/micrel/Makefile @@ -0,0 +1,9 @@ +# +# Makefile for the Micrel network device drivers. +# + +obj-$(CONFIG_ARM_KS8695_ETHER) += ks8695net.o +obj-$(CONFIG_KS8842) += ks8842.o +obj-$(CONFIG_KS8851) += ks8851.o +obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o +obj-$(CONFIG_KSZ884X_PCI) += ksz884x.o diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/ethernet/micrel/ks8695net.c similarity index 100% rename from drivers/net/arm/ks8695net.c rename to drivers/net/ethernet/micrel/ks8695net.c diff --git a/drivers/net/arm/ks8695net.h b/drivers/net/ethernet/micrel/ks8695net.h similarity index 100% rename from drivers/net/arm/ks8695net.h rename to drivers/net/ethernet/micrel/ks8695net.h diff --git a/drivers/net/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c similarity index 100% rename from drivers/net/ks8842.c rename to drivers/net/ethernet/micrel/ks8842.c diff --git a/drivers/net/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c similarity index 100% rename from drivers/net/ks8851.c rename to drivers/net/ethernet/micrel/ks8851.c diff --git a/drivers/net/ks8851.h b/drivers/net/ethernet/micrel/ks8851.h similarity index 100% rename from drivers/net/ks8851.h rename to drivers/net/ethernet/micrel/ks8851.h diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c similarity index 100% rename from drivers/net/ks8851_mll.c rename to drivers/net/ethernet/micrel/ks8851_mll.c diff --git a/drivers/net/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c similarity index 100% rename from drivers/net/ksz884x.c rename to drivers/net/ethernet/micrel/ksz884x.c