openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Vincent Cheng 2021-02-17 00:42:13 -05:00 committed by David S. Miller
parent 797d318654
commit e8b4d8b542
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/ptp/ptp_clockmatrix.c
View File

@ -1389,13 +1389,23 @@ static int idtcm_perout_enable(struct idtcm_channel *channel,
bool enable, bool enable,
struct ptp_perout_request *perout) struct ptp_perout_request *perout)
{ {
struct idtcm *idtcm = channel->idtcm;
unsigned int flags = perout->flags; unsigned int flags = perout->flags;
struct timespec64 ts = {0, 0};
int err;
if (flags == PEROUT_ENABLE_OUTPUT_MASK) 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);
/* Enable/disable individual output instead */ if (err) {
return idtcm_output_enable(channel, enable, perout->index); dev_err(&idtcm->client->dev, "Unable to set output enable");
return err;
}
/* 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, static int idtcm_get_pll_mode(struct idtcm_channel *channel,