ftgmac100/ftmac100: Move the Faraday drivers

Move the Faraday driver into drivers/net/ethernet/faraday/ and
make the necessary Kconfig and Makefile changes.

CC: "Po-Yu Chuang" <ratbert@faraday-tech.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: Po-Yu Chuang <ratbert@faraday-tech.com>

10 files changed, 46 insertions, 20 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7f09cd541c3b..8da9f9620680 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -922,15 +922,6 @@ config XILINX_EMACLITE
         help
           This driver supports the 10/100 Ethernet Lite from Xilinx.
 
-config FTMAC100
-        tristate "Faraday FTMAC100 10/100 Ethernet support"
-        depends on ARM
-        select MII
-        help
-          This driver supports the FTMAC100 10/100 Ethernet controller
-          from Faraday. It is used on Faraday A320, Andes AG101 and some
-          other ARM/NDS32 SoC's.
-
 config LANTIQ_ETOP
         tristate "Lantiq SoC ETOP driver"
         depends on SOC_TYPE_XWAY
@@ -1286,15 +1277,6 @@ config PCH_GBE
           ML7223 is companion chip for Intel Atom E6xx series.
           ML7223 is completely compatible for Intel EG20T PCH.
 
-config FTGMAC100
-        tristate "Faraday FTGMAC100 Gigabit Ethernet support"
-        depends on ARM
-        select PHYLIB
-        help
-          This driver supports the FTGMAC100 Gigabit Ethernet controller
-          from Faraday. It is used on Faraday A369, Andes AG102 and some
-          other ARM/NDS32 SoC's.
-
 endif # NETDEV_1000
 
 #
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index ffcb6090e40f..0b341dc04c13 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -79,8 +79,6 @@ ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
         obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o
 endif
 obj-$(CONFIG_FORCEDETH) += forcedeth.o
-obj-$(CONFIG_FTGMAC100) += ftgmac100.o
-obj-$(CONFIG_FTMAC100) += ftmac100.o
 
 obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
 obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 45d3eff86baa..110071ec4ce6 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -20,6 +20,7 @@ source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/cisco/Kconfig"
 source "drivers/net/ethernet/emulex/Kconfig"
 source "drivers/net/ethernet/neterion/Kconfig"
+source "drivers/net/ethernet/faraday/Kconfig"
 source "drivers/net/ethernet/ibm/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/i825xx/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 09536de3a366..4a6edf7141d2 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/
 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
 obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
+obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/
 obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
diff --git a/drivers/net/ethernet/faraday/Kconfig b/drivers/net/ethernet/faraday/Kconfig
new file mode 100644
index 000000000000..b0d76f01d47b
--- /dev/null
+++ b/drivers/net/ethernet/faraday/Kconfig
@@ -0,0 +1,38 @@
+#
+# Faraday device configuration
+#
+
+config NET_VENDOR_FARADAY
+        bool "Faraday devices"
+        depends on ARM
+        ---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 Faraday cards. If you say Y, you will be asked for
+          your specific card in the following questions.
+
+if NET_VENDOR_FARADAY
+
+config FTMAC100
+        tristate "Faraday FTMAC100 10/100 Ethernet support"
+        depends on ARM
+        select MII
+        ---help---
+          This driver supports the FTMAC100 10/100 Ethernet controller
+          from Faraday. It is used on Faraday A320, Andes AG101 and some
+          other ARM/NDS32 SoC's.
+
+config FTGMAC100
+        tristate "Faraday FTGMAC100 Gigabit Ethernet support"
+        depends on ARM
+        select PHYLIB
+        ---help---
+          This driver supports the FTGMAC100 Gigabit Ethernet controller
+          from Faraday. It is used on Faraday A369, Andes AG102 and some
+          other ARM/NDS32 SoC's.
+
+endif # NET_VENDOR_FARADAY
diff --git a/drivers/net/ethernet/faraday/Makefile b/drivers/net/ethernet/faraday/Makefile
new file mode 100644
index 000000000000..408b53980d53
--- /dev/null
+++ b/drivers/net/ethernet/faraday/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the Faraday device drivers.
+#
+
+obj-$(CONFIG_FTGMAC100) += ftgmac100.o
+obj-$(CONFIG_FTMAC100) += ftmac100.o
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 54709af917e9..54709af917e9 100644
--- a/drivers/net/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
diff --git a/drivers/net/ftgmac100.h b/drivers/net/ethernet/faraday/ftgmac100.h
index 13408d448b05..13408d448b05 100644
--- a/drivers/net/ftgmac100.h
+++ b/drivers/net/ethernet/faraday/ftgmac100.h
diff --git a/drivers/net/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
index 9bd7746cbfcf..9bd7746cbfcf 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ethernet/faraday/ftmac100.c
diff --git a/drivers/net/ftmac100.h b/drivers/net/ethernet/faraday/ftmac100.h
index 46a0c47b1ee1..46a0c47b1ee1 100644
--- a/drivers/net/ftmac100.h
+++ b/drivers/net/ethernet/faraday/ftmac100.h