diff options
| author | 2019-12-16 15:56:41 -0800 | |
|---|---|---|
| committer | 2019-12-16 15:56:41 -0800 | |
| commit | 0247743251993b56cb24084f09821791c4207fbb (patch) | |
| tree | c3e052858ea2ce7a2943d72ea838964ef406115b /include/linux | |
| parent | tcp: Set rcv zerocopy hint correctly if skb last frag is < PAGE_SIZE (diff) | |
| parent | dpaa2-ptp: add external trigger event support (diff) | |
Merge branch 'dpaa2-ptp-support-external-trigger-event'
Yangbo Lu says:
====================
dpaa2-ptp: support external trigger event
This patch-set is to add external trigger event support for
dpaa2-ptp driver since MC firmware has supported external
trigger interrupt with a new v2 dprtc_set_irq_mask() API.
And extts_clean_up() function in ptp_qoriq driver needs to be
exported with minor fixes for dpaa2-ptp reusing.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fsl/ptp_qoriq.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fsl/ptp_qoriq.h b/include/linux/fsl/ptp_qoriq.h index 992bf9fa1729..b0b743563f43 100644 --- a/include/linux/fsl/ptp_qoriq.h +++ b/include/linux/fsl/ptp_qoriq.h @@ -192,6 +192,7 @@ int ptp_qoriq_settime(struct ptp_clock_info *ptp, const struct timespec64 *ts); int ptp_qoriq_enable(struct ptp_clock_info *ptp, struct ptp_clock_request *rq, int on); +int extts_clean_up(struct ptp_qoriq *ptp_qoriq, int index, bool update_event); #ifdef CONFIG_DEBUG_FS void ptp_qoriq_create_debugfs(struct ptp_qoriq *ptp_qoriq); void ptp_qoriq_remove_debugfs(struct ptp_qoriq *ptp_qoriq); |
