ptp_qoriq: support FIPER3
Subsystems (6)
Yangbo Lu
maintainerv2 cover ptp_qoriq: support FIPER3
The FIPER3 (fixed interval period pulse generator) is supported on DPAA2 and ENETC network controller hardware. This patch-set is to support it in ptp_qoriq driver and dt-binding.
Changes for v2:
- Some improvement in code.
- Added ACK from Vladimir.
Yangbo Lu (2):
dt-binding: ptp_qoriq: support fsl,tmr-fiper3 property
ptp_qoriq: support FIPER3
Documentation/devicetree/bindings/ptp/ptp-qoriq.txt | 2 ++ drivers/ptp/ptp_qoriq.c | 20 +++++++++++++++++++- include/linux/fsl/ptp_qoriq.h | 3 +++ 3 files changed, 24 insertions(+), 1 deletion(-)
Signature · 1 line
2.7.4
Yangbo Lu
maintainerPATCH v2 1/2 dt-binding: ptp_qoriq: support fsl,tmr-fiper3 property
Add fsl,tmr-fiper3 property definition which is supported only on DPAA2 and ENETC network controller hardware.
---
Changes for v2:
- None.
--- Documentation/devicetree/bindings/ptp/ptp-qoriq.txt | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/ptp/ptp-qoriq.txt +2 -0
@@ -18,6 +18,8 @@ Clock Properties: - fsl,tmr-add Frequency compensation value. - fsl,tmr-fiper1 Fixed interval period pulse generator. - fsl,tmr-fiper2 Fixed interval period pulse generator. + - fsl,tmr-fiper3 Fixed interval period pulse generator. + Supported only on DPAA2 and ENETC hardware. - 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.
Signature · 1 line
2.7.4
Yangbo Lu
maintainerPATCH v2 2/2 ptp_qoriq: support FIPER3
In reply to Yangbo LuThe FIPER3 (fixed interval period pulse generator) is supported on DPAA2 and ENETC network controller hardware. This patch is to support it in ptp_qoriq driver.
---
Changes for v2:
- Some improvement in code.
- Added ACK from Vladimir.
--- drivers/ptp/ptp_qoriq.c | 20 +++++++++++++++++++- include/linux/fsl/ptp_qoriq.h | 3 +++ 2 files changed, 22 insertions(+), 1 deletion(-)
drivers/ptp/ptp_qoriq.c +19 -1
@@ -72,6 +72,10 @@ static void set_fipers(struct ptp_qoriq *ptp_qoriq)set_alarm (ptp_qoriq); ptp_qoriq->write (®s->fiper_regs->tmr_fiper1, ptp_qoriq->tmr_fiper1); ptp_qoriq->write (®s->fiper_regs->tmr_fiper2, ptp_qoriq->tmr_fiper2); + +if (ptp_qoriq->fiper3_support) + ptp_qoriq->write (®s->fiper_regs->tmr_fiper3, + ptp_qoriq->tmr_fiper3); }int extts_clean_up (struct ptp_qoriq *ptp_qoriq,int index,bool update_event)
@@ -366,6 +370,7 @@ static u32 ptp_qoriq_nominal_freq(u32 clk_src)* "fsl,tmr-add" * "fsl,tmr-fiper1" * "fsl,tmr-fiper2" +* "fsl,tmr-fiper3" (required only for DPAA2 and ENETC hardware) * "fsl,max-adj" * * Return 0 if success
@@ -412,6 +417,7 @@ static int ptp_qoriq_auto_config(struct ptp_qoriq *ptp_qoriq, ptp_qoriq->tmr_add = freq_comp; ptp_qoriq->tmr_fiper1 =DEFAULT_FIPER1_PERIOD - ptp_qoriq->tclk_period; ptp_qoriq->tmr_fiper2 =DEFAULT_FIPER2_PERIOD - ptp_qoriq->tclk_period; + ptp_qoriq->tmr_fiper3 =DEFAULT_FIPER3_PERIOD - ptp_qoriq->tclk_period;/* max_adj = 1000000000 * (freq_ratio - 1.0) - 1 * freq_ratio = reference_clock_freq / nominal_freq
@@ -446,6 +452,10 @@ int ptp_qoriq_init(struct ptp_qoriq *ptp_qoriq, void __iomem *base, else ptp_qoriq->extts_fifo_support = false; +if (of_device_is_compatible (node,"fsl,dpaa2-ptp" ) || +of_device_is_compatible (node,"fsl,enetc-ptp" )) + ptp_qoriq->fiper3_support = true; +if (of_property_read_u32 (node,"fsl,tclk-period" , &ptp_qoriq->tclk_period) || of_property_read_u32(node,
@@ -457,7 +467,10 @@ int ptp_qoriq_init(struct ptp_qoriq *ptp_qoriq, void __iomem *base, of_property_read_u32(node, "fsl,tmr-fiper2", &ptp_qoriq->tmr_fiper2) || of_property_read_u32(node, - "fsl,max-adj", &ptp_qoriq->caps.max_adj)) { + "fsl,max-adj", &ptp_qoriq->caps.max_adj) || + (ptp_qoriq->fiper3_support && + of_property_read_u32(node, "fsl,tmr-fiper3", + &ptp_qoriq->tmr_fiper3))) {pr_warn ("device tree node missing required elements, try automatic configuration\n" );if (ptp_qoriq_auto_config (ptp_qoriq, node))
@@ -502,6 +515,11 @@ int ptp_qoriq_init(struct ptp_qoriq *ptp_qoriq, void __iomem *base, ptp_qoriq->write (®s->ctrl_regs->tmr_prsc, ptp_qoriq->tmr_prsc); ptp_qoriq->write (®s->fiper_regs->tmr_fiper1, ptp_qoriq->tmr_fiper1); ptp_qoriq->write (®s->fiper_regs->tmr_fiper2, ptp_qoriq->tmr_fiper2); + +if (ptp_qoriq->fiper3_support) + ptp_qoriq->write (®s->fiper_regs->tmr_fiper3, + ptp_qoriq->tmr_fiper3); +set_alarm (ptp_qoriq); ptp_qoriq->write (®s->ctrl_regs->tmr_ctrl, tmr_ctrl|FIPERST |RTPE |TE |FRD );
include/linux/fsl/ptp_qoriq.h +3 -0
@@ -136,6 +136,7 @@ struct ptp_qoriq_registers {#define DEFAULT_TMR_PRSC 2#define DEFAULT_FIPER1_PERIOD 1000000000#define DEFAULT_FIPER2_PERIOD 1000000000 +#define DEFAULT_FIPER3_PERIOD 1000000000struct ptp_qoriq {void __iomem *base;
@@ -147,6 +148,7 @@ struct ptp_qoriq {struct dentry *debugfs_root;struct device *dev;bool extts_fifo_support; +bool fiper3_support;int irq;int phc_index;u32 tclk_period;/* nanoseconds */
@@ -155,6 +157,7 @@ struct ptp_qoriq {u32 cksel;u32 tmr_fiper1;u32 tmr_fiper2; +u32 tmr_fiper3;u32 (*read)(unsigned__iomem *addr);void (*write)(unsigned __iomem *addr,u32 val); };
Signature · 1 line
2.7.4
David Miller
maintainerFrom: Yangbo Lu <[email protected]>
Date: Fri, 18 Sep 2020 17:47:59 +0800
Quoted 7 lines
The FIPER3 (fixed interval period pulse generator) is supported on DPAA2 and ENETC network controller hardware. This patch-set is to support it in
ptp_qoriqdriver and dt-binding.Changes for v2:
- Some improvement in code.
- Added ACK from Vladimir.
Series applied, thanks.