diff options
author | Yangbo Lu <yangbo.lu@nxp.com> | 2018-10-08 10:44:25 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-10-08 20:23:22 +0300 |
commit | 0a006a2f894018c9042772833a0ca077c31d4f78 (patch) | |
tree | 11ac8c4e84442dfce6b59d55b03138b77e9c1499 | |
parent | abf1a08ff3237a27188ff8cc2904f2cea893af55 (diff) | |
download | linux-0a006a2f894018c9042772833a0ca077c31d4f78.tar.xz |
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: Yangbo Lu <yangbo.lu@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/freescale/Kconfig | 9 | ||||
-rw-r--r-- | drivers/net/ethernet/freescale/dpaa2/Kconfig | 17 | ||||
-rw-r--r-- | drivers/net/ethernet/freescale/dpaa2/Makefile | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c (renamed from drivers/staging/fsl-dpaa2/rtc/rtc.c) | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.h (renamed from drivers/staging/fsl-dpaa2/rtc/rtc.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h (renamed from drivers/staging/fsl-dpaa2/rtc/dprtc-cmd.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/freescale/dpaa2/dprtc.c (renamed from drivers/staging/fsl-dpaa2/rtc/dprtc.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/freescale/dpaa2/dprtc.h (renamed from drivers/staging/fsl-dpaa2/rtc/dprtc.h) | 0 | ||||
-rw-r--r-- | drivers/staging/fsl-dpaa2/Kconfig | 8 | ||||
-rw-r--r-- | drivers/staging/fsl-dpaa2/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/fsl-dpaa2/rtc/Makefile | 7 |
11 files changed, 23 insertions, 27 deletions
diff --git a/drivers/net/ethernet/freescale/Kconfig b/drivers/net/ethernet/freescale/Kconfig index 7a30276e1ba6..d3a62bc1f1c6 100644 --- a/drivers/net/ethernet/freescale/Kconfig +++ b/drivers/net/ethernet/freescale/Kconfig @@ -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 diff --git a/drivers/net/ethernet/freescale/dpaa2/Kconfig b/drivers/net/ethernet/freescale/dpaa2/Kconfig new file mode 100644 index 000000000000..67e64618b731 --- /dev/null +++ b/drivers/net/ethernet/freescale/dpaa2/Kconfig @@ -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. diff --git a/drivers/net/ethernet/freescale/dpaa2/Makefile b/drivers/net/ethernet/freescale/dpaa2/Makefile index 9315ecdba612..2f424e0a8225 100644 --- a/drivers/net/ethernet/freescale/dpaa2/Makefile +++ b/drivers/net/ethernet/freescale/dpaa2/Makefile @@ -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) diff --git a/drivers/staging/fsl-dpaa2/rtc/rtc.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c index 0d52cb85441f..2e90d5a3d920 100644 --- a/drivers/staging/fsl-dpaa2/rtc/rtc.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c @@ -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; diff --git a/drivers/staging/fsl-dpaa2/rtc/rtc.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.h index ff2e177395d4..ff2e177395d4 100644 --- a/drivers/staging/fsl-dpaa2/rtc/rtc.h +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.h diff --git a/drivers/staging/fsl-dpaa2/rtc/dprtc-cmd.h b/drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h index db6a473430cc..db6a473430cc 100644 --- a/drivers/staging/fsl-dpaa2/rtc/dprtc-cmd.h +++ b/drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h diff --git a/drivers/staging/fsl-dpaa2/rtc/dprtc.c b/drivers/net/ethernet/freescale/dpaa2/dprtc.c index 68ae6ffefbf5..68ae6ffefbf5 100644 --- a/drivers/staging/fsl-dpaa2/rtc/dprtc.c +++ b/drivers/net/ethernet/freescale/dpaa2/dprtc.c diff --git a/drivers/staging/fsl-dpaa2/rtc/dprtc.h b/drivers/net/ethernet/freescale/dpaa2/dprtc.h index 08f7c7bebbca..08f7c7bebbca 100644 --- a/drivers/staging/fsl-dpaa2/rtc/dprtc.h +++ b/drivers/net/ethernet/freescale/dpaa2/dprtc.h diff --git a/drivers/staging/fsl-dpaa2/Kconfig b/drivers/staging/fsl-dpaa2/Kconfig index 59aaae7268cd..991e154c0eca 100644 --- a/drivers/staging/fsl-dpaa2/Kconfig +++ b/drivers/staging/fsl-dpaa2/Kconfig @@ -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. diff --git a/drivers/staging/fsl-dpaa2/Makefile b/drivers/staging/fsl-dpaa2/Makefile index 464f242a8a4e..c92ab98c27d9 100644 --- a/drivers/staging/fsl-dpaa2/Makefile +++ b/drivers/staging/fsl-dpaa2/Makefile @@ -3,4 +3,3 @@ # obj-$(CONFIG_FSL_DPAA2_ETHSW) += ethsw/ -obj-$(CONFIG_FSL_DPAA2_PTP_CLOCK) += rtc/ diff --git a/drivers/staging/fsl-dpaa2/rtc/Makefile b/drivers/staging/fsl-dpaa2/rtc/Makefile deleted file mode 100644 index 5468da071163..000000000000 --- a/drivers/staging/fsl-dpaa2/rtc/Makefile +++ /dev/null @@ -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 |