From: David S. Miller <davem@davemloft.net>
Date: Tue, 14 Oct 2014 18:45:17 +0000 (-0400)
Subject: Merge branch 'fec-ptp'
X-Git-Tag: firefly_0821_release~176^2~3001^2~55
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f787d6c8dd52ded9874cbbc447a32515c80fa2bf;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fec-ptp'

Luwei Zhou says:

====================
Enable FEC pps feather

Change from v2 to v3:
	-Using the default channel 0 to be PPS channel not PTP_PIN_SET/GETFUNC interface.
	-Using the linux definition of NSEC_PER_SEC.

Change from v1 to v2:
	- Fix the potential 32-bit multiplication overflow issue.
	- Optimize the hareware adjustment code to improve efficiency as Richard suggested
	- Use ptp PTP_PIN_SET/GETFUNC interface to set PPS channel not device tree
	and add PTP_PF_PPS enumeration
	- Modify comments style
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

f787d6c8dd52ded9874cbbc447a32515c80fa2bf