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

Commit 7b35f033 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

bfin_mac: Move the Analog Devices Inc driver 



Move the Analog Devices Inc driver into drivers/net/ethernet/adi/ and
make the necessary Kconfig and Makefile changes.

CC: <uclinux-dist-devel@blackfin.uclinux.org>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: default avatarBob Liu <bob.liu@analog.com>
parent ae7668d0

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1446,7 +1446,7 @@ BLACKFIN EMAC DRIVER 
L:	uclinux-dist-devel@blackfin.uclinux.org

W:	http://blackfin.uclinux.org

S:	Supported

F:	drivers/net/bfin_mac.*

F:	drivers/net/ethernet/adi/



BLACKFIN RTC DRIVER

M:	Mike Frysinger <vapier.adi@gmail.com>

drivers/net/Kconfig

+0 −46
Original line number Diff line number Diff line
@@ -252,52 +252,6 @@ config SH_ETH 
	  This driver supporting CPUs are:

		- SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.



config BFIN_MAC

	tristate "Blackfin on-chip MAC support"

	depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)

	select CRC32

	select MII

	select PHYLIB

	select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE

	help

	  This is the driver for Blackfin on-chip mac device. Say Y if you want it

	  compiled into the kernel. This driver is also available as a module

	  ( = code which can be inserted in and removed from the running kernel

	  whenever you want). The module will be called bfin_mac.



config BFIN_MAC_USE_L1

	bool "Use L1 memory for rx/tx packets"

	depends on BFIN_MAC && (BF527 || BF537)

	default y

	help

	  To get maximum network performance, you should use L1 memory as rx/tx buffers.

	  Say N here if you want to reserve L1 memory for other uses.



config BFIN_TX_DESC_NUM

	int "Number of transmit buffer packets"

	depends on BFIN_MAC

	range 6 10 if BFIN_MAC_USE_L1

	range 10 100

	default "10"

	help

	  Set the number of buffer packets used in driver.



config BFIN_RX_DESC_NUM

	int "Number of receive buffer packets"

	depends on BFIN_MAC

	range 20 100 if BFIN_MAC_USE_L1

	range 20 800

	default "20"

	help

	  Set the number of buffer packets used in driver.



config BFIN_MAC_USE_HWSTAMP

	bool "Use IEEE 1588 hwstamp"

	depends on BFIN_MAC && BF518

	default y

	help

	  To support the IEEE 1588 Precision Time Protocol (PTP), select y here



config NET_NETX

	tristate "NetX Ethernet support"

	select MII

drivers/net/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ obj-$(CONFIG_EQUALIZER) += eql.o 
obj-$(CONFIG_TUN) += tun.o

obj-$(CONFIG_VETH) += veth.o

obj-$(CONFIG_NET_NETX) += netx-eth.o

obj-$(CONFIG_BFIN_MAC) += bfin_mac.o

obj-$(CONFIG_DM9000) += dm9000.o

obj-$(CONFIG_ENC28J60) += enc28j60.o

obj-$(CONFIG_ETHOC) += ethoc.o

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ source "drivers/net/ethernet/3com/Kconfig" 
source "drivers/net/ethernet/amd/Kconfig"

source "drivers/net/ethernet/apple/Kconfig"

source "drivers/net/ethernet/atheros/Kconfig"

source "drivers/net/ethernet/adi/Kconfig"

source "drivers/net/ethernet/broadcom/Kconfig"

source "drivers/net/ethernet/brocade/Kconfig"

source "drivers/net/ethernet/chelsio/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ obj-$(CONFIG_NET_VENDOR_8390) += 8390/ 
obj-$(CONFIG_NET_VENDOR_AMD) += amd/

obj-$(CONFIG_NET_VENDOR_APPLE) += apple/

obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/

obj-$(CONFIG_NET_BFIN) += adi/

obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/

obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/

obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/