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

Merge branch 'ptp_qoriq' 



Yangbo Lu says:

====================
External trigger stamp fifo support for ptp_qoriq

This patch-set is to add external trigger stamp fifo support by a new
binding "fsl,extts-fifo", and to add fiper pulse loopback support which
is very useful for validating trigger without external hardware.
Also fixed issues in interrupt enabling/handling.

"fsl,extts-fifo" is required to be added into 1588 timer dts node whose
hardware supports it. The work will be done for some QorIQ platforms dts in
the near future.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ed175d9c 53deab23

Documentation/devicetree/bindings/ptp/ptp-qoriq.txt

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ Clock Properties: 
  - fsl,tmr-fiper1   Fixed interval period pulse generator.

  - fsl,tmr-fiper2   Fixed interval period pulse generator.

  - fsl,max-adj      Maximum frequency adjustment in parts per billion.

  - fsl,extts-fifo   The presence of this property indicates hardware

		     support for the external trigger stamp FIFO.



  These properties set the operational parameters for the PTP

  clock. You must choose these carefully for the clock to work right.

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -6087,6 +6087,7 @@ M: Yangbo Lu <yangbo.lu@nxp.com> 
L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/ptp/ptp_qoriq.c

F:	drivers/ptp/ptp_qoriq_debugfs.c

F:	include/linux/fsl/ptp_qoriq.h

F:	Documentation/devicetree/bindings/ptp/ptp-qoriq.txt

arch/arm/boot/dts/ls1021a.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -706,6 +706,7 @@ 
			fsl,tmr-fiper1  = <999999995>;

			fsl,tmr-fiper2  = <99990>;

			fsl,max-adj     = <499999999>;

			fsl,extts-fifo;

		};



		enet0: ethernet@2d10000 {

drivers/ptp/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ config PTP_1588_CLOCK_QORIQ 
	  packets using the SO_TIMESTAMPING API.



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

	  will be called ptp_qoriq.

	  will be called ptp-qoriq.



config PTP_1588_CLOCK_IXP46X

	tristate "Intel IXP46x as PTP clock"

drivers/ptp/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -9,4 +9,6 @@ obj-$(CONFIG_PTP_1588_CLOCK_DTE) += ptp_dte.o 
obj-$(CONFIG_PTP_1588_CLOCK_IXP46X)	+= ptp_ixp46x.o

obj-$(CONFIG_PTP_1588_CLOCK_PCH)	+= ptp_pch.o

obj-$(CONFIG_PTP_1588_CLOCK_KVM)	+= ptp_kvm.o

obj-$(CONFIG_PTP_1588_CLOCK_QORIQ)	+= ptp_qoriq.o
 
obj-$(CONFIG_PTP_1588_CLOCK_QORIQ)	+= ptp-qoriq.o

ptp-qoriq-y				+= ptp_qoriq.o

ptp-qoriq-$(CONFIG_DEBUG_FS)		+= ptp_qoriq_debugfs.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE