stmmac: Move the STMicroelectronics driver
Move the STMicroelectronics driver into driver/net/ethernet/stmicro/ and make the necessary Kconfig and Makefile changes. CC: Giuseppe Cavallaro <peppe.cavallaro@st.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>hifive-unleashed-5.1
Jeff Kirsher
parent
ef7f54297d
commit
7ac6653a08
|
|
@ -2029,7 +2029,7 @@ M: Giuseppe Cavallaro <peppe.cavallaro@st.com>
|
|||
L: netdev@vger.kernel.org
|
||||
W: http://www.stlinux.com
|
||||
S: Supported
|
||||
F: drivers/net/stmmac/
|
||||
F: drivers/net/ethernet/stmicro/stmmac/
|
||||
|
||||
CYBERPRO FB DRIVER
|
||||
M: Russell King <linux@arm.linux.org.uk>
|
||||
|
|
|
|||
|
|
@ -1406,8 +1406,6 @@ config S6GMAC
|
|||
To compile this driver as a module, choose M here. The module
|
||||
will be called s6gmac.
|
||||
|
||||
source "drivers/net/stmmac/Kconfig"
|
||||
|
||||
config PCH_GBE
|
||||
tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GbE"
|
||||
depends on PCI
|
||||
|
|
|
|||
|
|
@ -67,7 +67,6 @@ obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o
|
|||
obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
|
||||
obj-$(CONFIG_RIONET) += rionet.o
|
||||
obj-$(CONFIG_SH_ETH) += sh_eth.o
|
||||
obj-$(CONFIG_STMMAC_ETH) += stmmac/
|
||||
|
||||
#
|
||||
# end link order section
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ source "drivers/net/ethernet/qlogic/Kconfig"
|
|||
source "drivers/net/ethernet/racal/Kconfig"
|
||||
source "drivers/net/ethernet/sfc/Kconfig"
|
||||
source "drivers/net/ethernet/smsc/Kconfig"
|
||||
source "drivers/net/ethernet/stmicro/Kconfig"
|
||||
source "drivers/net/ethernet/sun/Kconfig"
|
||||
source "drivers/net/ethernet/tehuti/Kconfig"
|
||||
|
||||
|
|
|
|||
|
|
@ -21,5 +21,6 @@ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
|
|||
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
|
||||
obj-$(CONFIG_SFC) += sfc/
|
||||
obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
|
||||
obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
|
||||
obj-$(CONFIG_NET_VENDOR_SUN) += sun/
|
||||
obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
#
|
||||
# STMicroelectronics device configuration
|
||||
#
|
||||
|
||||
config NET_VENDOR_STMICRO
|
||||
bool "STMicroelectronics devices"
|
||||
depends on HAS_IOMEM
|
||||
---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 STMicroelectronics cards. If you say Y, you will
|
||||
be asked for your specific card in the following questions.
|
||||
|
||||
if NET_VENDOR_STMICRO
|
||||
|
||||
source "drivers/net/ethernet/stmicro/stmmac/Kconfig"
|
||||
|
||||
endif # NET_VENDOR_STMICRO
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
#
|
||||
# Makefile for the STMicroelectronics device drivers.
|
||||
#
|
||||
|
||||
obj-$(CONFIG_STMMAC_ETH) += stmmac/
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
config STMMAC_ETH
|
||||
tristate "STMicroelectronics 10/100/1000 Ethernet driver"
|
||||
depends on HAS_IOMEM
|
||||
select MII
|
||||
select PHYLIB
|
||||
select CRC32
|
||||
depends on NETDEVICES && HAS_IOMEM
|
||||
help
|
||||
---help---
|
||||
This is the driver for the Ethernet IPs are built around a
|
||||
Synopsys IP Core and only tested on the STMicroelectronics
|
||||
platforms.
|
||||
|
|
@ -14,7 +14,7 @@ if STMMAC_ETH
|
|||
config STMMAC_DA
|
||||
bool "STMMAC DMA arbitration scheme"
|
||||
default n
|
||||
help
|
||||
---help---
|
||||
Selecting this option, rx has priority over Tx (only for Giga
|
||||
Ethernet device).
|
||||
By default, the DMA arbitration scheme is based on Round-robin
|
||||
|
|
@ -24,7 +24,7 @@ config STMMAC_DUAL_MAC
|
|||
bool "STMMAC: dual mac support (EXPERIMENTAL)"
|
||||
default n
|
||||
depends on EXPERIMENTAL && STMMAC_ETH && !STMMAC_TIMER
|
||||
help
|
||||
---help---
|
||||
Some ST SoCs (for example the stx7141 and stx7200c2) have two
|
||||
Ethernet Controllers. This option turns on the second Ethernet
|
||||
device on this kind of platforms.
|
||||
|
|
@ -33,7 +33,7 @@ config STMMAC_TIMER
|
|||
bool "STMMAC Timer optimisation"
|
||||
default n
|
||||
depends on RTC_HCTOSYS_DEVICE
|
||||
help
|
||||
---help---
|
||||
Use an external timer for mitigating the number of network
|
||||
interrupts. Currently, for SH architectures, it is possible
|
||||
to use the TMU channel 2 and the SH-RTC device.
|
||||
|
|
@ -45,12 +45,12 @@ choice
|
|||
config STMMAC_TMU_TIMER
|
||||
bool "TMU channel 2"
|
||||
depends on CPU_SH4
|
||||
help
|
||||
---help---
|
||||
|
||||
config STMMAC_RTC_TIMER
|
||||
bool "Real time clock"
|
||||
depends on RTC_CLASS
|
||||
help
|
||||
---help---
|
||||
|
||||
endchoice
|
||||
|
||||
Loading…
Reference in New Issue