Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit baf0fbfe authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

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: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: default avatarPo-Yu Chuang <ratbert@faraday-tech.com>
parent b47da977

drivers/net/Kconfig

+0 −18
Original line number Diff line number Diff line
@@ -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



#

drivers/net/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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/

drivers/net/ethernet/faraday/Kconfig

0 → 100644
+38 −0
Original line number Diff line number Diff line 
#

# 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