Signed-off-by: Russell King (Oracle) --- drivers/net/dsa/mv88e6xxx/hwtstamp.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/hwtstamp.c b/drivers/net/dsa/mv88e6xxx/hwtstamp.c index 0a56e7bcbcd9..dc92381d5c07 100644 --- a/drivers/net/dsa/mv88e6xxx/hwtstamp.c +++ b/drivers/net/dsa/mv88e6xxx/hwtstamp.c @@ -544,6 +544,17 @@ static int mv88e6xxx_hwtstamp_port_setup(struct mv88e6xxx_chip *chip, int port) return 0; } +static int mv88e6xxx_ts_global_write(struct device *dev, u8 reg, u16 val) +{ + struct mv88e6xxx_chip *chip = dev_to_chip(dev); + + return chip->info->ops->avb_ops->ptp_write(chip, reg, val); +} + +static const struct marvell_ts_ops mv88e6xxx_ts_ops = { + .ts_global_write = mv88e6xxx_ts_global_write, +}; + int mv88e6xxx_hwtstamp_setup(struct mv88e6xxx_chip *chip) { const struct mv88e6xxx_ptp_ops *ptp_ops = chip->info->ops->ptp_ops; @@ -564,8 +575,7 @@ int mv88e6xxx_hwtstamp_setup(struct mv88e6xxx_chip *chip) return err; } - /* Set the ethertype of L2 PTP messages */ - err = mv88e6xxx_ptp_write(chip, MV88E6XXX_PTP_ETHERTYPE, ETH_P_1588); + err = marvell_ts_global_config(chip->dev, &mv88e6xxx_ts_ops); if (err) return err; -- 2.47.3