Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2690729pxb; Thu, 11 Feb 2021 21:12:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJw72eWO91UVroGNhdHunQlxtcF76sPgpVfpEH3iC/3IyhOprGhaZSVOd4TZ2M3mUwORs+BN X-Received: by 2002:a17:906:e088:: with SMTP id gh8mr1284411ejb.294.1613106748333; Thu, 11 Feb 2021 21:12:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613106748; cv=none; d=google.com; s=arc-20160816; b=oqWK3BrmVxMwjrJSBHCzLRQt0qnheE5c1OKGzLf/cygbK6s2b/Y45T4IaTrtoMOBt2 nO9ATw5oVUbQGIZiJAFGRDHXRxw9DqGZAWVMN9qX6AQI6HTOguJhaSR0jSGRZyzMyYFx +TVu9mS+bDBKzuN5tUx+sZca0HH4mWEVPkQfar+qKnv5djWxZvsKa0k828OM8dVmE6IE gZwc4R2ZcEDCoFROuBGkrUT25p3IP35J/N+6X0Aak+JlZRZXMS/Vzn5orz0jLa7aJ4OU Qac/z6fLywJJbsNfNW3WUK0D4dTc5aYzMy5GEII/J35PUOASpQ1fwNCyhYbgadXv/Q2h PmKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=QOdX7OIYAhRh5A9lL75DdIxHxvWhBfiLHSyWiqJLD1I=; b=aLsZ9lVJGkuKY7JyC7YT8fM4vc//U+ePNRQfe4YoR8jny66WGJyaSQLctOLxo7H8Kn Evml4WRF9bsXG/84YS+Qn/h7p0qhnTPc9RxmObN56JsJxfDTb3yKtZdUPzVUpaV2F2fF CMp8wa/1/B9EZ0rIXyUh4LUWedJCv4oOSHQkpAD91KjgR80FKpzrMIsn56S8nW3TuQBf TwIGj7rmJmmZG7yTz9huP3nJukHghGth9fex+7Dc0I4ViCb6NSp2hczrLv3AM3+PLExf N46TJ2RvT5iYx5caviYL5bEkqHE1YJUiiNTqUMdjFTD8IIsq+FlYS9ifZI8wwCGBkKmX buLA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bi1si1222328edb.247.2021.02.11.21.12.05; Thu, 11 Feb 2021 21:12:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229720AbhBLFJy (ORCPT + 99 others); Fri, 12 Feb 2021 00:09:54 -0500 Received: from pbmsgap02.intersil.com ([192.157.179.202]:45328 "EHLO pbmsgap02.intersil.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229457AbhBLFJs (ORCPT ); Fri, 12 Feb 2021 00:09:48 -0500 Received: from pps.filterd (pbmsgap02.intersil.com [127.0.0.1]) by pbmsgap02.intersil.com (8.16.0.42/8.16.0.42) with SMTP id 11C4dHAT021700; Thu, 11 Feb 2021 23:39:17 -0500 Received: from pbmxdp01.intersil.corp (pbmxdp01.pb.intersil.com [132.158.200.222]) by pbmsgap02.intersil.com with ESMTP id 36hp5k2bh6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 11 Feb 2021 23:39:17 -0500 Received: from pbmxdp01.intersil.corp (132.158.200.222) by pbmxdp01.intersil.corp (132.158.200.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1979.3; Thu, 11 Feb 2021 23:39:15 -0500 Received: from localhost (132.158.202.108) by pbmxdp01.intersil.corp (132.158.200.222) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Thu, 11 Feb 2021 23:39:15 -0500 From: To: CC: , , Vincent Cheng Subject: [PATCH net-next 2/2] ptp: ptp_clockmatrix: Add alignment of 1 PPS to idtcm_perout_enable. Date: Thu, 11 Feb 2021 23:38:45 -0500 Message-ID: <1613104725-22056-3-git-send-email-vincent.cheng.xh@renesas.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1613104725-22056-1-git-send-email-vincent.cheng.xh@renesas.com> References: <1613104725-22056-1-git-send-email-vincent.cheng.xh@renesas.com> X-TM-AS-MML: disable MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369,18.0.737 definitions=2021-02-11_07:2021-02-11,2021-02-11 signatures=0 X-Proofpoint-Spam-Details: rule=junk_notspam policy=junk score=0 spamscore=0 adultscore=0 mlxscore=0 bulkscore=0 mlxlogscore=966 malwarescore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2102120032 X-Proofpoint-Spam-Reason: mlx Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vincent Cheng 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 --- drivers/ptp/ptp_clockmatrix.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/ptp/ptp_clockmatrix.c b/drivers/ptp/ptp_clockmatrix.c index 1918de5..ebe540e 100644 --- a/drivers/ptp/ptp_clockmatrix.c +++ b/drivers/ptp/ptp_clockmatrix.c @@ -1401,13 +1401,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, -- 2.7.4