Skip to content

Commit

Permalink
net: fec: refactor PPS channel configuration
Browse files Browse the repository at this point in the history
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>
Reviewed-by: Csókás, Bence <csokas.bence@prolan.hu>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  • Loading branch information
Francesco Dolcini authored and Paolo Abeni committed Oct 8, 2024
1 parent 1aa772b commit bf8ca67
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/net/ethernet/freescale/fec_ptp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -524,8 +523,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);
Expand All @@ -536,10 +536,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);
Expand Down

0 comments on commit bf8ca67

Please sign in to comment.