]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
freescale: Move the Freescale drivers
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sat, 11 Jun 2011 09:29:36 +0000 (02:29 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Fri, 12 Aug 2011 07:22:12 +0000 (00:22 -0700)
Move the Freescale drivers into drivers/net/ethernet/freescale/ and
make the necessary Kconfig and Makefile changes.

CC: Sandeep Gopalpet <sandeep.kumar@freescale.com>
CC: Andy Fleming <afleming@freescale.com>
CC: Shlomi Gridish <gridish@freescale.com>
CC: Li Yang <leoli@freescale.com>
CC: Pantelis Antoniou <pantelis.antoniou@gmail.com>
CC: Vitaly Bordug <vbordug@ru.mvista.com>
CC: Dan Malek <dmalek@jlc.net>
CC: Sylvain Munaut <tnt@246tNt.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
32 files changed:
MAINTAINERS
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/ethernet/Kconfig
drivers/net/ethernet/Makefile
drivers/net/ethernet/freescale/Kconfig [new file with mode: 0644]
drivers/net/ethernet/freescale/Makefile [new file with mode: 0644]
drivers/net/ethernet/freescale/fec.c [moved from drivers/net/fec.c with 100% similarity]
drivers/net/ethernet/freescale/fec.h [moved from drivers/net/fec.h with 100% similarity]
drivers/net/ethernet/freescale/fec_mpc52xx.c [moved from drivers/net/fec_mpc52xx.c with 100% similarity]
drivers/net/ethernet/freescale/fec_mpc52xx.h [moved from drivers/net/fec_mpc52xx.h with 100% similarity]
drivers/net/ethernet/freescale/fec_mpc52xx_phy.c [moved from drivers/net/fec_mpc52xx_phy.c with 100% similarity]
drivers/net/ethernet/freescale/fs_enet/Kconfig [moved from drivers/net/fs_enet/Kconfig with 91% similarity]
drivers/net/ethernet/freescale/fs_enet/Makefile [moved from drivers/net/fs_enet/Makefile with 100% similarity]
drivers/net/ethernet/freescale/fs_enet/fec.h [moved from drivers/net/fs_enet/fec.h with 100% similarity]
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c [moved from drivers/net/fs_enet/fs_enet-main.c with 100% similarity]
drivers/net/ethernet/freescale/fs_enet/fs_enet.h [moved from drivers/net/fs_enet/fs_enet.h with 100% similarity]
drivers/net/ethernet/freescale/fs_enet/mac-fcc.c [moved from drivers/net/fs_enet/mac-fcc.c with 100% similarity]
drivers/net/ethernet/freescale/fs_enet/mac-fec.c [moved from drivers/net/fs_enet/mac-fec.c with 100% similarity]
drivers/net/ethernet/freescale/fs_enet/mac-scc.c [moved from drivers/net/fs_enet/mac-scc.c with 100% similarity]
drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c [moved from drivers/net/fs_enet/mii-bitbang.c with 100% similarity]
drivers/net/ethernet/freescale/fs_enet/mii-fec.c [moved from drivers/net/fs_enet/mii-fec.c with 100% similarity]
drivers/net/ethernet/freescale/fsl_pq_mdio.c [moved from drivers/net/fsl_pq_mdio.c with 100% similarity]
drivers/net/ethernet/freescale/fsl_pq_mdio.h [moved from drivers/net/fsl_pq_mdio.h with 100% similarity]
drivers/net/ethernet/freescale/gianfar.c [moved from drivers/net/gianfar.c with 100% similarity]
drivers/net/ethernet/freescale/gianfar.h [moved from drivers/net/gianfar.h with 100% similarity]
drivers/net/ethernet/freescale/gianfar_ethtool.c [moved from drivers/net/gianfar_ethtool.c with 100% similarity]
drivers/net/ethernet/freescale/gianfar_ptp.c [moved from drivers/net/gianfar_ptp.c with 100% similarity]
drivers/net/ethernet/freescale/gianfar_sysfs.c [moved from drivers/net/gianfar_sysfs.c with 100% similarity]
drivers/net/ethernet/freescale/ucc_geth.c [moved from drivers/net/ucc_geth.c with 100% similarity]
drivers/net/ethernet/freescale/ucc_geth.h [moved from drivers/net/ucc_geth.h with 100% similarity]
drivers/net/ethernet/freescale/ucc_geth_ethtool.c [moved from drivers/net/ucc_geth_ethtool.c with 100% similarity]

index 5b2ad6c8cac11a99426f8f96f31b2a33a04c91f1..77ca43046b7e1c67e9b03c3b08f26576defc34c6 100644 (file)
@@ -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>
index 27f97b4e83b18a9fd418edfe5669b4fd4e72761d..b645a73fd21274e0ee2024a2f88ce137ea28f518 100644 (file)
@@ -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
index 07cad1a79456eefcda3f7e4f509df4411d8c5b52..39fe73033a029c2e736fa1540a764cafb52efd83 100644 (file)
@@ -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/
index d3aff7456baef85f51cec72838beb9b6d7be7239..924c287aaaa9720b89ff7a345958f16848f00526 100644 (file)
@@ -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"
index b098c5e1fa2c00b380efe116e2b92dc385d1aa4b..025d7b763b91339088032352902c35937ec5d4d4 100644 (file)
@@ -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 (file)
index 0000000..2fd2c61
--- /dev/null
@@ -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 (file)
index 0000000..1752488
--- /dev/null
@@ -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
similarity index 91%
rename from drivers/net/fs_enet/Kconfig
rename to drivers/net/ethernet/freescale/fs_enet/Kconfig
index fc073b5a38c7c61543a9348d7fabb6d7327d3d2c..be92229f2c2a52f447c96a086e4683cc0c341e68 100644 (file)
@@ -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