| Message ID | 20240807144349.297342-3-francesco@dolcini.it (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: fec: add PPS channel configuration | expand |
On Wed, Aug 07, 2024 at 04:43:47PM +0200, Francesco Dolcini wrote: > From: Francesco Dolcini <francesco.dolcini@toradex.com> > > Preparation patch to allow for PPS channel configuration, no functional > change intended. > > Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com> Reviewed-by: Frank Li <Frank.Li@nxp.com> > --- > drivers/net/ethernet/freescale/fec_ptp.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c > index e32f6724f568..6f0f8bf61752 100644 > --- a/drivers/net/ethernet/freescale/fec_ptp.c > +++ b/drivers/net/ethernet/freescale/fec_ptp.c > @@ -84,8 +84,7 @@ > #define FEC_CC_MULT (1 << 31) > #define FEC_COUNTER_PERIOD (1 << 31) > #define PPS_OUPUT_RELOAD_PERIOD NSEC_PER_SEC > -#define FEC_CHANNLE_0 0 > -#define DEFAULT_PPS_CHANNEL FEC_CHANNLE_0 > +#define DEFAULT_PPS_CHANNEL 0 > > #define FEC_PTP_MAX_NSEC_PERIOD 4000000000ULL > #define FEC_PTP_MAX_NSEC_COUNTER 0x80000000ULL > @@ -530,8 +529,9 @@ static int fec_ptp_enable(struct ptp_clock_info *ptp, > unsigned long flags; > int ret = 0; > > + fep->pps_channel = DEFAULT_PPS_CHANNEL; > + > if (rq->type == PTP_CLK_REQ_PPS) { > - fep->pps_channel = DEFAULT_PPS_CHANNEL; > fep->reload_period = PPS_OUPUT_RELOAD_PERIOD; > > ret = fec_ptp_enable_pps(fep, on); > @@ -542,10 +542,9 @@ static int fec_ptp_enable(struct ptp_clock_info *ptp, > if (rq->perout.flags) > return -EOPNOTSUPP; > > - if (rq->perout.index != DEFAULT_PPS_CHANNEL) > + if (rq->perout.index != fep->pps_channel) > return -EOPNOTSUPP; > > - fep->pps_channel = DEFAULT_PPS_CHANNEL; > period.tv_sec = rq->perout.period.sec; > period.tv_nsec = rq->perout.period.nsec; > period_ns = timespec64_to_ns(&period); > -- > 2.39.2 >
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c index e32f6724f568..6f0f8bf61752 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -84,8 +84,7 @@ #define FEC_CC_MULT (1 << 31) #define FEC_COUNTER_PERIOD (1 << 31) #define PPS_OUPUT_RELOAD_PERIOD NSEC_PER_SEC -#define FEC_CHANNLE_0 0 -#define DEFAULT_PPS_CHANNEL FEC_CHANNLE_0 +#define DEFAULT_PPS_CHANNEL 0 #define FEC_PTP_MAX_NSEC_PERIOD 4000000000ULL #define FEC_PTP_MAX_NSEC_COUNTER 0x80000000ULL @@ -530,8 +529,9 @@ static int fec_ptp_enable(struct ptp_clock_info *ptp, unsigned long flags; int ret = 0; + fep->pps_channel = DEFAULT_PPS_CHANNEL; + if (rq->type == PTP_CLK_REQ_PPS) { - fep->pps_channel = DEFAULT_PPS_CHANNEL; fep->reload_period = PPS_OUPUT_RELOAD_PERIOD; ret = fec_ptp_enable_pps(fep, on); @@ -542,10 +542,9 @@ static int fec_ptp_enable(struct ptp_clock_info *ptp, if (rq->perout.flags) return -EOPNOTSUPP; - if (rq->perout.index != DEFAULT_PPS_CHANNEL) + if (rq->perout.index != fep->pps_channel) return -EOPNOTSUPP; - fep->pps_channel = DEFAULT_PPS_CHANNEL; period.tv_sec = rq->perout.period.sec; period.tv_nsec = rq->perout.period.nsec; period_ns = timespec64_to_ns(&period);