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

Commit 531778d0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dpaa2-eth-Move-DPAA2-Ethernet-driver' 

Ioana Radulescu says:

====================
dpaa2-eth: Move DPAA2 Ethernet driver

The Freescale/NXP DPAA2 Ethernet driver was first included in
drivers/staging, due to its dependencies on two components located
there at the time of its initial submission:
* the fsl-mc bus driver, which was moved to drivers/bus in kernel 4.17
* the dpio driver, which was moved to drivers/soc/fsl in kernel 4.18

More information on the DPAA2 architecture and the interactions
between the fsl-mc bus and the objects present on it can be found in:
Documentation/networking/dpaa2/overview.rst

For easier review, the patch is generated without the -M option,
although the driver files are moved without any code changes.

changes since v1[1]:
* remove RFC label, since dependencies have been merged on net-next
* add patch fixing a possible race at probe (reported by Andrew Lunn)

[1] https://lore.kernel.org/patchwork/patch/971333/


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 459479da 34ff6846

Documentation/networking/dpaa2/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ DPAA2 Documentation 


   overview

   dpio-driver

   ethernet-driver

MAINTAINERS

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

drivers/net/ethernet/freescale/Kconfig

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

drivers/net/ethernet/freescale/Makefile

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