ptp: ptp_clockmatrix: Add alignment of 1 PPS to idtcm_perout_enable.

When enabling output using PTP_CLK_REQ_PEROUT, need to align the output
clock to the internal 1 PPS clock.

Signed-off-by: Vincent Cheng <vincent.cheng.xh@renesas.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/ptp/ptp_clockmatrix.c b/drivers/ptp/ptp_clockmatrix.c
index 9bfd32b..f597e4f 100644 (file)
--- a/drivers/ptp/ptp_clockmatrix.c
+++ b/drivers/ptp/ptp_clockmatrix.c
@@ -1389,13 +1389,23 @@ static int idtcm_perout_enable(struct idtcm_channel *channel,
                               bool enable,
                               struct ptp_perout_request *perout)
 {
+       struct idtcm *idtcm = channel->idtcm;
        unsigned int flags = perout->flags;
+       struct timespec64 ts = {0, 0};
+       int err;
 
        if (flags == PEROUT_ENABLE_OUTPUT_MASK)
-               return idtcm_output_mask_enable(channel, enable);
+               err = idtcm_output_mask_enable(channel, enable);
+       else
+               err = idtcm_output_enable(channel, enable, perout->index);
+
+       if (err) {
+               dev_err(&idtcm->client->dev, "Unable to set output enable");
+               return err;
+       }
 
-       /* Enable/disable individual output instead */
-       return idtcm_output_enable(channel, enable, perout->index);
+       /* Align output to internal 1 PPS */
+       return _idtcm_settime(channel, &ts, SCSR_TOD_WR_TYPE_SEL_DELTA_PLUS);
 }
 
 static int idtcm_get_pll_mode(struct idtcm_channel *channel,