Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-17 18:36:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yangbo Lu 2018-10-08 15:44:25 +08:00 committed by David S. Miller
parent abf1a08ff3
commit 0a006a2f89
11 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/freescale/Kconfig
View File

@ -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

17
drivers/net/ethernet/freescale/dpaa2/Kconfig Normal file
View File

@ -0,0 +1,17 @@
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.

6
drivers/net/ethernet/freescale/dpaa2/Makefile
View File

@ -3,9 +3,11 @@
# Makefile for the Freescale DPAA2 Ethernet controller
#
obj-$(CONFIG_FSL_DPAA2_ETH) += fsl-dpaa2-eth.o
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-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)

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

@ -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;

0
drivers/staging/fsl-dpaa2/rtc/rtc.h → drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.h
View File

0
drivers/staging/fsl-dpaa2/rtc/dprtc-cmd.h → drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h
View File

0
drivers/staging/fsl-dpaa2/rtc/dprtc.c → drivers/net/ethernet/freescale/dpaa2/dprtc.c
View File

0
drivers/staging/fsl-dpaa2/rtc/dprtc.h → drivers/net/ethernet/freescale/dpaa2/dprtc.h
View File

8
drivers/staging/fsl-dpaa2/Kconfig
View File

@ -16,11 +16,3 @@ config FSL_DPAA2_ETHSW
---help---
Driver for Freescale DPAA2 Ethernet Switch. Select
BRIDGE to have support for bridge tools.
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.

1
drivers/staging/fsl-dpaa2/Makefile
View File

@ -3,4 +3,3 @@
#
obj-$(CONFIG_FSL_DPAA2_ETHSW) += ethsw/
obj-$(CONFIG_FSL_DPAA2_PTP_CLOCK) += rtc/

7
drivers/staging/fsl-dpaa2/rtc/Makefile
View File

@ -1,7 +0,0 @@
#
# Makefile for the Freescale DPAA2 PTP clock
#
obj-$(CONFIG_FSL_DPAA2_PTP_CLOCK) += dpaa2-rtc.o
dpaa2-rtc-objs := rtc.o dprtc.o