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>
mariux64 · Sep 2, 2018 · 34ff684 · 34ff684
1 parent 7f12c8a
commit 34ff684
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 29 deletions.
diff --git a/...ng/fsl-dpaa2/ethernet/ethernet-driver.rst → ...tion/networking/dpaa2/ethernet-driver.rst b/...ng/fsl-dpaa2/ethernet/ethernet-driver.rst → ...tion/networking/dpaa2/ethernet-driver.rst
diff --git a/Documentation/networking/dpaa2/index.rst b/Documentation/networking/dpaa2/index.rst
@@ -7,3 +7,4 @@ DPAA2 Documentation
 
    overview
    dpio-driver
+   ethernet-driver
diff --git a/MAINTAINERS b/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>

diff --git a/drivers/net/ethernet/freescale/Kconfig b/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
diff --git a/drivers/net/ethernet/freescale/Makefile b/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/
diff --git a/drivers/staging/fsl-dpaa2/ethernet/Makefile → ...ers/net/ethernet/freescale/dpaa2/Makefile b/drivers/staging/fsl-dpaa2/ethernet/Makefile → ...ers/net/ethernet/freescale/dpaa2/Makefile
diff --git a/...ging/fsl-dpaa2/ethernet/dpaa2-eth-trace.h → ...thernet/freescale/dpaa2/dpaa2-eth-trace.h b/...ging/fsl-dpaa2/ethernet/dpaa2-eth-trace.h → ...thernet/freescale/dpaa2/dpaa2-eth-trace.h
diff --git a/...rs/staging/fsl-dpaa2/ethernet/dpaa2-eth.c → .../net/ethernet/freescale/dpaa2/dpaa2-eth.c b/...rs/staging/fsl-dpaa2/ethernet/dpaa2-eth.c → .../net/ethernet/freescale/dpaa2/dpaa2-eth.c
diff --git a/...rs/staging/fsl-dpaa2/ethernet/dpaa2-eth.h → .../net/ethernet/freescale/dpaa2/dpaa2-eth.h b/...rs/staging/fsl-dpaa2/ethernet/dpaa2-eth.h → .../net/ethernet/freescale/dpaa2/dpaa2-eth.h
diff --git a/...taging/fsl-dpaa2/ethernet/dpaa2-ethtool.c → .../ethernet/freescale/dpaa2/dpaa2-ethtool.c b/...taging/fsl-dpaa2/ethernet/dpaa2-ethtool.c → .../ethernet/freescale/dpaa2/dpaa2-ethtool.c
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpkg.h → drivers/net/ethernet/freescale/dpaa2/dpkg.h b/drivers/staging/fsl-dpaa2/ethernet/dpkg.h → drivers/net/ethernet/freescale/dpaa2/dpkg.h
diff --git a/...ers/staging/fsl-dpaa2/ethernet/dpni-cmd.h → ...s/net/ethernet/freescale/dpaa2/dpni-cmd.h b/...ers/staging/fsl-dpaa2/ethernet/dpni-cmd.h → ...s/net/ethernet/freescale/dpaa2/dpni-cmd.h
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpni.c → drivers/net/ethernet/freescale/dpaa2/dpni.c b/drivers/staging/fsl-dpaa2/ethernet/dpni.c → drivers/net/ethernet/freescale/dpaa2/dpni.c
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpni.h → drivers/net/ethernet/freescale/dpaa2/dpni.h b/drivers/staging/fsl-dpaa2/ethernet/dpni.h → drivers/net/ethernet/freescale/dpaa2/dpni.h
diff --git a/drivers/staging/fsl-dpaa2/Kconfig b/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

diff --git a/drivers/staging/fsl-dpaa2/Makefile b/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/
diff --git a/drivers/staging/fsl-dpaa2/ethernet/TODO b/drivers/staging/fsl-dpaa2/ethernet/TODO