Commit 2785543f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Jakub Kicinski
Browse files

ptp: ixp46x: move adjacent to ethernet driver 



The ixp46x ptp driver has a somewhat unusual setup, where the ptp
driver and the ethernet driver are in different directories but
access the same registers that are defined a platform specific
header file.

Moving everything into drivers/net/ makes it look more like most
other ptp drivers and allows compile-testing this driver on
other targets.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent c74f16b6

drivers/net/ethernet/xscale/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -27,4 +27,18 @@ config IXP4XX_ETH 
	  Say Y here if you want to use built-in Ethernet ports

	  on IXP4xx processor.



config PTP_1588_CLOCK_IXP46X

	tristate "Intel IXP46x as PTP clock"

	depends on IXP4XX_ETH

	depends on PTP_1588_CLOCK

	default y

	help

	  This driver adds support for using the IXP46X as a PTP

	  clock. This clock is only useful if your PTP programs are

	  getting hardware time stamps on the PTP Ethernet packets

	  using the SO_TIMESTAMPING API.



	  To compile this driver as a module, choose M here: the module

	  will be called ptp_ixp46x.



endif # NET_VENDOR_XSCALE

drivers/net/ethernet/xscale/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ 
#



obj-$(CONFIG_IXP4XX_ETH)		+= ixp4xx_eth.o

obj-$(CONFIG_PTP_1588_CLOCK_IXP46X)	+= ptp_ixp46x.o

drivers/net/ethernet/xscale/ixp4xx_eth.c

+2 −1
Original line number Diff line number Diff line
@@ -33,10 +33,11 @@ 
#include <linux/ptp_classify.h>

#include <linux/slab.h>

#include <linux/module.h>

#include <mach/ixp46x_ts.h>

#include <linux/soc/ixp4xx/npe.h>

#include <linux/soc/ixp4xx/qmgr.h>



#include "ixp46x_ts.h"



#define DEBUG_DESC		0

#define DEBUG_RX		0

#define DEBUG_TX		0

drivers/ptp/ptp_ixp46x.c→drivers/net/ethernet/xscale/ptp_ixp46x.c

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
#include <linux/module.h>



#include <linux/ptp_clock_kernel.h>

#include <mach/ixp46x_ts.h>



#include "ixp46x_ts.h"



#define DRIVER		"ptp_ixp46x"

#define N_EXT_TS	2

CRA Git | Maintained and supported by SUSTech CRA and CCSE