32 files changed, 111 insertions, 87 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 5b2ad6c8cac..77ca43046b7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2689,7 +2689,7 @@ M:	Vitaly Bordug <vbordug@ru.mvista.com>
 L:      linuxppc-dev@lists.ozlabs.org
 L:      netdev@vger.kernel.org
 S:      Maintained
-F:      drivers/net/fs_enet/
+F:      drivers/net/ethernet/freescale/fs_enet/
 F:      include/linux/fs_enet_pd.h
 
 FREESCALE QUICC ENGINE LIBRARY
@@ -2711,7 +2711,7 @@ M:	Li Yang <leoli@freescale.com>
 L:      netdev@vger.kernel.org
 L:      linuxppc-dev@lists.ozlabs.org
 S:      Maintained
-F:      drivers/net/ucc_geth*
+F:      drivers/net/ethernet/freescale/ucc_geth*
 
 FREESCALE QUICC ENGINE UCC UART DRIVER
 M:      Timur Tabi <timur@freescale.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 27f97b4e83b..b645a73fd21 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -605,39 +605,6 @@ config NET_POCKET
           the questions about this class of network devices. If you say Y, you
           will be asked for your specific device in the following questions.
 
-config FEC
-        bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
-        depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
-                IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC
-        default IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC if ARM
-        select PHYLIB
-        help
-          Say Y here if you want to use the built-in 10/100 Fast ethernet
-          controller on some Motorola ColdFire and Freescale i.MX processors.
-
-config FEC_MPC52xx
-        tristate "MPC52xx FEC driver"
-        depends on PPC_MPC52xx && PPC_BESTCOMM
-        select CRC32
-        select PHYLIB
-        select PPC_BESTCOMM_FEC
-        ---help---
-          This option enables support for the MPC5200's on-chip
-          Fast Ethernet Controller
-          If compiled as module, it will be called fec_mpc52xx.
-
-config FEC_MPC52xx_MDIO
-        bool "MPC52xx FEC MDIO bus driver"
-        depends on FEC_MPC52xx
-        default y
-        ---help---
-          The MPC5200's FEC can connect to the Ethernet either with
-          an external MII PHY chip or 10 Mbps 7-wire interface
-          (Motorola? industry standard).
-          If your board uses an external PHY connected to FEC, enable this.
-          If not sure, enable.
-          If compiled as module, it will be called fec_mpc52xx_phy.
-
 config XILINX_EMACLITE
         tristate "Xilinx 10/100 Ethernet Lite support"
         depends on PPC32 || MICROBLAZE
@@ -651,9 +618,6 @@ config LANTIQ_ETOP
         help
           Support for the MII0 inside the Lantiq SoC
 
-
-source "drivers/net/fs_enet/Kconfig"
-
 source "drivers/net/octeon/Kconfig"
 
 endif # NET_ETHERNET
@@ -769,36 +733,6 @@ config GELIC_WIRELESS
           the driver automatically distinguishes the models, you can
           safely enable this option even if you have a wireless-less model.
 
-config FSL_PQ_MDIO
-        tristate "Freescale PQ MDIO"
-        depends on FSL_SOC
-        select PHYLIB
-        help
-          This driver supports the MDIO bus used by the gianfar and UCC drivers.
-
-config GIANFAR
-        tristate "Gianfar Ethernet"
-        depends on FSL_SOC
-        select FSL_PQ_MDIO
-        select PHYLIB
-        select CRC32
-        help
-          This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,
-          and MPC86xx family of chips, and the FEC on the 8540.
-
-config UCC_GETH
-        tristate "Freescale QE Gigabit Ethernet"
-        depends on QUICC_ENGINE
-        select FSL_PQ_MDIO
-        select PHYLIB
-        help
-          This driver supports the Gigabit Ethernet mode of the QUICC Engine,
-          which is available on some Freescale SOCs.
-
-config UGETH_TX_ON_DEMAND
-        bool "Transmit on Demand support"
-        depends on UCC_GETH
-
 config XILINX_LL_TEMAC
         tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
         depends on PPC || MICROBLAZE
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 07cad1a7945..39fe73033a0 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -13,20 +13,9 @@ obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o
 obj-$(CONFIG_IP1000) += ipg.o
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_BONDING) += bonding/
-obj-$(CONFIG_GIANFAR) += gianfar_driver.o
-obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
 obj-$(CONFIG_JME) += jme.o
 obj-$(CONFIG_VMXNET3) += vmxnet3/
 
-gianfar_driver-objs := gianfar.o \
-                gianfar_ethtool.o \
-                gianfar_sysfs.o
-
-obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
-ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o
-
-obj-$(CONFIG_FSL_PQ_MDIO) += fsl_pq_mdio.o
-
 #
 # link order important here
 #
@@ -63,11 +52,6 @@ obj-$(CONFIG_HAMACHI) += hamachi.o
 obj-$(CONFIG_NET) += Space.o loopback.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
 obj-$(CONFIG_HP100) += hp100.o
-obj-$(CONFIG_FEC) += fec.o
-obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o
-ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
-        obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o
-endif
 obj-$(CONFIG_FORCEDETH) += forcedeth.o
 
 obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
@@ -139,8 +123,6 @@ obj-$(CONFIG_ETRAX_ETHERNET) += cris/
 
 obj-$(CONFIG_NETCONSOLE) += netconsole.o
 
-obj-$(CONFIG_FS_ENET) += fs_enet/
-
 obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
 
 obj-$(CONFIG_WIMAX) += wimax/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index d3aff7456ba..924c287aaaa 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -24,6 +24,7 @@ source "drivers/net/ethernet/dlink/Kconfig"
 source "drivers/net/ethernet/emulex/Kconfig"
 source "drivers/net/ethernet/neterion/Kconfig"
 source "drivers/net/ethernet/faraday/Kconfig"
+source "drivers/net/ethernet/freescale/Kconfig"
 source "drivers/net/ethernet/fujitsu/Kconfig"
 source "drivers/net/ethernet/ibm/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index b098c5e1fa2..025d7b763b9 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/
 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
 obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
 obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/
+obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/
 obj-$(CONFIG_NET_VENDOR_FUJITSU) += fujitsu/
 obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
diff --git a/drivers/net/ethernet/freescale/Kconfig b/drivers/net/ethernet/freescale/Kconfig
new file mode 100644
index 00000000000..2fd2c614c08
--- /dev/null
+++ b/drivers/net/ethernet/freescale/Kconfig
@@ -0,0 +1,88 @@
+#
+# Freescale device configuration
+#
+
+config NET_VENDOR_FREESCALE
+        bool "Freescale devices"
+        depends on FSL_SOC || QUICC_ENGINE || CPM1 || CPM2 || PPC_MPC512x || \
+                   M523x || M527x || M5272 || M528x || M520x || M532x || \
+                   IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC || \
+                   (PPC_MPC52xx && PPC_BESTCOMM)
+        ---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 IBM devices. If you say Y, you will be asked for
+          your specific card in the following questions.
+
+if NET_VENDOR_FREESCALE
+
+config FEC
+        bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
+        depends on (M523x || M527x || M5272 || M528x || M520x || M532x || \
+                    IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC)
+        default IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC if ARM
+        select PHYLIB
+        ---help---
+          Say Y here if you want to use the built-in 10/100 Fast ethernet
+          controller on some Motorola ColdFire and Freescale i.MX processors.
+
+config FEC_MPC52xx
+        tristate "FEC MPC52xx driver"
+        depends on PPC_MPC52xx && PPC_BESTCOMM
+        select CRC32
+        select PHYLIB
+        select PPC_BESTCOMM_FEC
+        ---help---
+          This option enables support for the MPC5200's on-chip
+          Fast Ethernet Controller
+          If compiled as module, it will be called fec_mpc52xx.
+
+config FEC_MPC52xx_MDIO
+        bool "FEC MPC52xx MDIO bus driver"
+        depends on FEC_MPC52xx
+        default y
+        ---help---
+          The MPC5200's FEC can connect to the Ethernet either with
+          an external MII PHY chip or 10 Mbps 7-wire interface
+          (Motorola? industry standard).
+          If your board uses an external PHY connected to FEC, enable this.
+          If not sure, enable.
+          If compiled as module, it will be called fec_mpc52xx_phy.
+
+source "drivers/net/ethernet/freescale/fs_enet/Kconfig"
+
+config FSL_PQ_MDIO
+        tristate "Freescale PQ MDIO"
+        depends on FSL_SOC
+        select PHYLIB
+        ---help---
+          This driver supports the MDIO bus used by the gianfar and UCC drivers.
+
+config UCC_GETH
+        tristate "Freescale QE Gigabit Ethernet"
+        depends on QUICC_ENGINE
+        select FSL_PQ_MDIO
+        select PHYLIB
+        ---help---
+          This driver supports the Gigabit Ethernet mode of the QUICC Engine,
+          which is available on some Freescale SOCs.
+
+config UGETH_TX_ON_DEMAND
+        bool "Transmit on Demand support"
+        depends on UCC_GETH
+
+config GIANFAR
+        tristate "Gianfar Ethernet"
+        depends on FSL_SOC
+        select FSL_PQ_MDIO
+        select PHYLIB
+        select CRC32
+        ---help---
+          This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,
+          and MPC86xx family of chips, and the FEC on the 8540.
+
+endif # NET_VENDOR_FREESCALE
diff --git a/drivers/net/ethernet/freescale/Makefile b/drivers/net/ethernet/freescale/Makefile
new file mode 100644
index 00000000000..1752488c9ee
--- /dev/null
+++ b/drivers/net/ethernet/freescale/Makefile
@@ -0,0 +1,18 @@
+#
+# Makefile for the Freescale network device drivers.
+#
+
+obj-$(CONFIG_FEC) += fec.o
+obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o
+ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
+        obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o
+endif
+obj-$(CONFIG_FS_ENET) += fs_enet/
+obj-$(CONFIG_FSL_PQ_MDIO) += fsl_pq_mdio.o
+obj-$(CONFIG_GIANFAR) += gianfar_driver.o
+obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
+gianfar_driver-objs := gianfar.o \
+                gianfar_ethtool.o \
+                gianfar_sysfs.o
+obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
+ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o
diff --git a/drivers/net/fec.c b/drivers/net/ethernet/freescale/fec.c
index e8266ccf818..e8266ccf818 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
diff --git a/drivers/net/fec.h b/drivers/net/ethernet/freescale/fec.h
index 8b2c6d797e6..8b2c6d797e6 100644
--- a/drivers/net/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c
index cb4416e591f..cb4416e591f 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c
diff --git a/drivers/net/fec_mpc52xx.h b/drivers/net/ethernet/freescale/fec_mpc52xx.h
index 41d2dffde55..41d2dffde55 100644
--- a/drivers/net/fec_mpc52xx.h
+++ b/drivers/net/ethernet/freescale/fec_mpc52xx.h
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c
index 360a578c2bb..360a578c2bb 100644
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c
diff --git a/drivers/net/fs_enet/Kconfig b/drivers/net/ethernet/freescale/fs_enet/Kconfig
index fc073b5a38c..be92229f2c2 100644
--- a/drivers/net/fs_enet/Kconfig
+++ b/drivers/net/ethernet/freescale/fs_enet/Kconfig
@@ -1,6 +1,6 @@
 config FS_ENET
        tristate "Freescale Ethernet Driver"
-       depends on CPM1 || CPM2 || PPC_MPC512x
+       depends on NET_VENDOR_FREESCALE && (CPM1 || CPM2 || PPC_MPC512x)
        select MII
        select PHYLIB
 
diff --git a/drivers/net/fs_enet/Makefile b/drivers/net/ethernet/freescale/fs_enet/Makefile
index d4a305ee345..d4a305ee345 100644
--- a/drivers/net/fs_enet/Makefile
+++ b/drivers/net/ethernet/freescale/fs_enet/Makefile
diff --git a/drivers/net/fs_enet/fec.h b/drivers/net/ethernet/freescale/fs_enet/fec.h
index e980527e2b9..e980527e2b9 100644
--- a/drivers/net/fs_enet/fec.h
+++ b/drivers/net/ethernet/freescale/fs_enet/fec.h
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index 329ef231a09..329ef231a09 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
diff --git a/drivers/net/fs_enet/fs_enet.h b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
index 1ece4b1a689..1ece4b1a689 100644
--- a/drivers/net/fs_enet/fs_enet.h
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
index 7583a9572bc..7583a9572bc 100644
--- a/drivers/net/fs_enet/mac-fcc.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
index b9fbc83d64a..b9fbc83d64a 100644
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
index 22a02a76706..22a02a76706 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
index b09270b5d0a..b09270b5d0a 100644
--- a/drivers/net/fs_enet/mii-bitbang.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
index e0e9d6c35d8..e0e9d6c35d8 100644
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
index 52f4e8ad48e..52f4e8ad48e 100644
--- a/drivers/net/fsl_pq_mdio.c
+++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
diff --git a/drivers/net/fsl_pq_mdio.h b/drivers/net/ethernet/freescale/fsl_pq_mdio.h
index bd17a2a0139..bd17a2a0139 100644
--- a/drivers/net/fsl_pq_mdio.h
+++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.h
diff --git a/drivers/net/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 2659daad783..2659daad783 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
diff --git a/drivers/net/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h
index 9aa43773e8e..9aa43773e8e 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/ethernet/freescale/gianfar.h
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
index 6e350692d11..6e350692d11 100644
--- a/drivers/net/gianfar_ethtool.c
+++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
diff --git a/drivers/net/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c
index f67b8aebc89..f67b8aebc89 100644
--- a/drivers/net/gianfar_ptp.c
+++ b/drivers/net/ethernet/freescale/gianfar_ptp.c
diff --git a/drivers/net/gianfar_sysfs.c b/drivers/net/ethernet/freescale/gianfar_sysfs.c
index 64f4094ac7f..64f4094ac7f 100644
--- a/drivers/net/gianfar_sysfs.c
+++ b/drivers/net/ethernet/freescale/gianfar_sysfs.c
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 42f8e31b0bb..42f8e31b0bb 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ethernet/freescale/ucc_geth.h
index d12fcad145e..d12fcad145e 100644
--- a/drivers/net/ucc_geth.h
+++ b/drivers/net/ethernet/freescale/ucc_geth.h
diff --git a/drivers/net/ucc_geth_ethtool.c b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
index a97257f91a3..a97257f91a3 100644
--- a/drivers/net/ucc_geth_ethtool.c
+++ b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c