Browse Source

dpaa2-eth: Move DPAA2 Ethernet driver from staging to drivers/net

The DPAA2 Ethernet driver supports Freescale/NXP SoCs with DPAA2
(DataPath Acceleration Architecture v2). The driver manages
network objects discovered on the fsl-mc bus.

Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ioana Radulescu 7 years ago
parent
commit
34ff68465a

+ 0 - 0
drivers/staging/fsl-dpaa2/ethernet/ethernet-driver.rst → Documentation/networking/dpaa2/ethernet-driver.rst


+ 1 - 0
Documentation/networking/dpaa2/index.rst

@@ -7,3 +7,4 @@ DPAA2 Documentation
 
    overview
    dpio-driver
+   ethernet-driver

+ 2 - 2
MAINTAINERS

@@ -4527,9 +4527,9 @@ F:	drivers/soc/fsl/dpio
 
 DPAA2 ETHERNET DRIVER
 M:	Ioana Radulescu <ruxandra.radulescu@nxp.com>
-L:	linux-kernel@vger.kernel.org
+L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/staging/fsl-dpaa2/ethernet
+F:	drivers/net/ethernet/freescale/dpaa2
 
 DPAA2 ETHERNET SWITCH DRIVER
 M:	Ioana Radulescu <ruxandra.radulescu@nxp.com>

+ 8 - 0
drivers/net/ethernet/freescale/Kconfig

@@ -97,4 +97,12 @@ config GIANFAR
 
 source "drivers/net/ethernet/freescale/dpaa/Kconfig"
 
+config FSL_DPAA2_ETH
+	tristate "Freescale DPAA2 Ethernet"
+	depends on FSL_MC_BUS && FSL_MC_DPIO
+	depends on NETDEVICES && ETHERNET
+	---help---
+	  Ethernet driver for Freescale DPAA2 SoCs, using the
+	  Freescale MC bus driver
+
 endif # NET_VENDOR_FREESCALE

+ 2 - 0
drivers/net/ethernet/freescale/Makefile

@@ -21,3 +21,5 @@ ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o
 
 obj-$(CONFIG_FSL_FMAN) += fman/
 obj-$(CONFIG_FSL_DPAA_ETH) += dpaa/
+
+obj-$(CONFIG_FSL_DPAA2_ETH) += dpaa2/

+ 0 - 0
drivers/staging/fsl-dpaa2/ethernet/Makefile → drivers/net/ethernet/freescale/dpaa2/Makefile


+ 0 - 0
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth-trace.h → drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-trace.h


+ 0 - 0
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c → drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c


+ 0 - 0
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h → drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h


+ 0 - 0
drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c → drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c


+ 0 - 0
drivers/staging/fsl-dpaa2/ethernet/dpkg.h → drivers/net/ethernet/freescale/dpaa2/dpkg.h


+ 0 - 0
drivers/staging/fsl-dpaa2/ethernet/dpni-cmd.h → drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h


+ 0 - 0
drivers/staging/fsl-dpaa2/ethernet/dpni.c → drivers/net/ethernet/freescale/dpaa2/dpni.c


+ 0 - 0
drivers/staging/fsl-dpaa2/ethernet/dpni.h → drivers/net/ethernet/freescale/dpaa2/dpni.h


+ 0 - 8
drivers/staging/fsl-dpaa2/Kconfig

@@ -9,14 +9,6 @@ config FSL_DPAA2
 	  Build drivers for Freescale DataPath Acceleration
 	  Architecture (DPAA2) family of SoCs.
 
-config FSL_DPAA2_ETH
-	tristate "Freescale DPAA2 Ethernet"
-	depends on FSL_DPAA2 && FSL_MC_DPIO
-	depends on NETDEVICES && ETHERNET
-	---help---
-	  Ethernet driver for Freescale DPAA2 SoCs, using the
-	  Freescale MC bus driver
-
 config FSL_DPAA2_ETHSW
 	tristate "Freescale DPAA2 Ethernet Switch"
 	depends on FSL_DPAA2

+ 0 - 1
drivers/staging/fsl-dpaa2/Makefile

@@ -2,6 +2,5 @@
 # Freescale DataPath Acceleration Architecture Gen2 (DPAA2) drivers
 #
 
-obj-$(CONFIG_FSL_DPAA2_ETH)		+= ethernet/
 obj-$(CONFIG_FSL_DPAA2_ETHSW)		+= ethsw/
 obj-$(CONFIG_FSL_DPAA2_PTP_CLOCK)	+= rtc/

+ 0 - 18
drivers/staging/fsl-dpaa2/ethernet/TODO

@@ -1,18 +0,0 @@
-* Add a DPAA2 MAC kernel driver in order to allow PHY management; currently
-  the DPMAC objects and their link to DPNIs are handled by MC internally
-  and all PHYs are seen as fixed-link
-* add more debug support: decide how to expose detailed debug statistics,
-  add ingress error queue support
-* MC firmware uprev; the DPAA2 objects used by the Ethernet driver need to
-  be kept in sync with binary interface changes in MC
-* refine README file
-* cleanup
-
-NOTE: None of the above is must-have before getting the DPAA2 Ethernet driver
-out of staging. The main requirement for that is to have the drivers it
-depends on, fsl-mc bus and DPIO driver, moved to drivers/bus and drivers/soc
-respectively.
-
- Please send any patches to Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
- ruxandra.radulescu@nxp.com, devel@driverdev.osuosl.org,
- linux-kernel@vger.kernel.org