Commit 2e77eded authored by Jacob Keller's avatar Jacob Keller Committed by David S. Miller

ptp_phc: convert .adjfreq to .adjfine

The ptp_phc implementation of .adjfreq is implemented in terms of a
straight forward "base * ppb / 1 billion" calculation.

Convert this to the newer .adjfine, updating the driver to use the recently
introduced adjust_by_scaled_ppm helper function.
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3b738db5
...@@ -336,24 +336,13 @@ static irqreturn_t isr(int irq, void *priv) ...@@ -336,24 +336,13 @@ static irqreturn_t isr(int irq, void *priv)
* PTP clock operations * PTP clock operations
*/ */
static int ptp_pch_adjfreq(struct ptp_clock_info *ptp, s32 ppb) static int ptp_pch_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)
{ {
u64 adj; u32 addend;
u32 diff, addend;
int neg_adj = 0;
struct pch_dev *pch_dev = container_of(ptp, struct pch_dev, caps); struct pch_dev *pch_dev = container_of(ptp, struct pch_dev, caps);
struct pch_ts_regs __iomem *regs = pch_dev->regs; struct pch_ts_regs __iomem *regs = pch_dev->regs;
if (ppb < 0) { addend = adjust_by_scaled_ppm(DEFAULT_ADDEND, scaled_ppm);
neg_adj = 1;
ppb = -ppb;
}
addend = DEFAULT_ADDEND;
adj = addend;
adj *= ppb;
diff = div_u64(adj, 1000000000ULL);
addend = neg_adj ? addend - diff : addend + diff;
iowrite32(addend, &regs->addend); iowrite32(addend, &regs->addend);
...@@ -440,7 +429,7 @@ static const struct ptp_clock_info ptp_pch_caps = { ...@@ -440,7 +429,7 @@ static const struct ptp_clock_info ptp_pch_caps = {
.n_ext_ts = N_EXT_TS, .n_ext_ts = N_EXT_TS,
.n_pins = 0, .n_pins = 0,
.pps = 0, .pps = 0,
.adjfreq = ptp_pch_adjfreq, .adjfine = ptp_pch_adjfine,
.adjtime = ptp_pch_adjtime, .adjtime = ptp_pch_adjtime,
.gettime64 = ptp_pch_gettime, .gettime64 = ptp_pch_gettime,
.settime64 = ptp_pch_settime, .settime64 = ptp_pch_settime,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment