diff options
| author | David S. Miller <davem@davemloft.net> | 2019-01-22 20:21:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-22 20:21:58 -0800 |
| commit | a2ff7e49ec5035973776665b5bf491de8f3467ae (patch) | |
| tree | 5ca2e10d5a40098d1a2d8efa36fa8ba08f5684d2 /include/linux | |
| parent | ed175d9c6f0d4df0f83f22ff4c887c21b7d021cd (diff) | |
| parent | 53deab23c00afbbe491ad58054bbc63517d6232f (diff) | |
| download | cachepc-linux-a2ff7e49ec5035973776665b5bf491de8f3467ae.tar.gz cachepc-linux-a2ff7e49ec5035973776665b5bf491de8f3467ae.zip | |
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fsl/ptp_qoriq.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/linux/fsl/ptp_qoriq.h b/include/linux/fsl/ptp_qoriq.h index c1f003aadcce..94e9797e434c 100644 --- a/include/linux/fsl/ptp_qoriq.h +++ b/include/linux/fsl/ptp_qoriq.h @@ -120,6 +120,8 @@ struct qoriq_ptp_registers { /* Bit definitions for the TMR_STAT register */ #define STAT_VEC_SHIFT (0) /* Timer general purpose status vector */ #define STAT_VEC_MASK (0x3f) +#define ETS1_VLD (1<<24) +#define ETS2_VLD (1<<25) /* Bit definitions for the TMR_PRSC register */ #define PRSC_OCK_SHIFT (0) /* Output clock division/prescale factor. */ @@ -141,6 +143,9 @@ struct qoriq_ptp { struct ptp_clock *clock; struct ptp_clock_info caps; struct resource *rsrc; + struct dentry *debugfs_root; + struct device *dev; + bool extts_fifo_support; int irq; int phc_index; u64 alarm_interval; /* for periodic alarm */ @@ -166,4 +171,14 @@ static inline void qoriq_write(unsigned __iomem *addr, u32 val) iowrite32be(val, addr); } +#ifdef CONFIG_DEBUG_FS +void ptp_qoriq_create_debugfs(struct qoriq_ptp *qoriq_ptp); +void ptp_qoriq_remove_debugfs(struct qoriq_ptp *qoriq_ptp); +#else +static inline void ptp_qoriq_create_debugfs(struct qoriq_ptp *qoriq_ptp) +{ } +static inline void ptp_qoriq_remove_debugfs(struct qoriq_ptp *qoriq_ptp) +{ } +#endif + #endif |