Commit 0a006a2f authored by Yangbo Lu's avatar Yangbo Lu Committed by David S. Miller
Browse files

net: dpaa2: move DPAA2 PTP driver out of staging/ 



This patch is to move DPAA2 PTP driver out of staging/
since the dpaa2-eth had been moved out.

Signed-off-by: default avatarYangbo Lu <yangbo.lu@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent abf1a08f

drivers/net/ethernet/freescale/Kconfig

+1 −8
Original line number Diff line number Diff line
@@ -96,13 +96,6 @@ config GIANFAR 
	  on the 8540.



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

source "drivers/net/ethernet/freescale/dpaa2/Kconfig"



endif # NET_VENDOR_FREESCALE

drivers/net/ethernet/freescale/dpaa2/Kconfig

0 → 100644
+17 −0
Original line number Diff line number Diff line 
config FSL_DPAA2_ETH

	tristate "Freescale DPAA2 Ethernet"

	depends on FSL_MC_BUS && FSL_MC_DPIO

	depends on NETDEVICES && ETHERNET

	help

	  This is the DPAA2 Ethernet driver supporting Freescale SoCs

	  with DPAA2 (DataPath Acceleration Architecture v2).

	  The driver manages network objects discovered on the Freescale

	  MC bus.



config FSL_DPAA2_PTP_CLOCK

	tristate "Freescale DPAA2 PTP Clock"

	depends on FSL_DPAA2_ETH && POSIX_TIMERS

	select PTP_1588_CLOCK

	help

	  This driver adds support for using the DPAA2 1588 timer module

	  as a PTP clock.

drivers/net/ethernet/freescale/dpaa2/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -4,8 +4,10 @@ 
#



obj-$(CONFIG_FSL_DPAA2_ETH)		+= fsl-dpaa2-eth.o

obj-$(CONFIG_FSL_DPAA2_PTP_CLOCK)	+= fsl-dpaa2-ptp.o



fsl-dpaa2-eth-objs	:= dpaa2-eth.o dpaa2-ethtool.o dpni.o

fsl-dpaa2-ptp-objs	:= dpaa2-ptp.o dprtc.o



# Needed by the tracing framework

CFLAGS_dpaa2-eth.o := -I$(src)

drivers/staging/fsl-dpaa2/rtc/rtc.c→drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <linux/ptp_clock_kernel.h>

#include <linux/fsl/mc.h>



#include "rtc.h"

#include "dpaa2-ptp.h"



struct ptp_dpaa2_priv {

	struct fsl_mc_device *rtc_mc_dev;