[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20241125091639.2729916-4-csokas.bence@prolan.hu>
Date: Mon, 25 Nov 2024 10:16:39 +0100
From: Csókás, Bence <csokas.bence@...lan.hu>
To: <stable@...r.kernel.org>, <netdev@...r.kernel.org>,
<linux-kernel@...r.kernel.org>
CC: Francesco Dolcini <francesco.dolcini@...adex.com>, Sasha Levin
<sashal@...nel.org>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, "Frank
Li" <Frank.Li@....com>, Rafael Beims <rafael.beims@...adex.com>,
Csókás, Bence <csokas.bence@...lan.hu>, Paolo Abeni
<pabeni@...hat.com>, Wei Fang <wei.fang@....com>, Shenwei Wang
<shenwei.wang@....com>, Clark Wang <xiaoning.wang@....com>, NXP Linux Team
<linux-imx@....com>, "David S. Miller" <davem@...emloft.net>, Eric Dumazet
<edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>, Richard Cochran
<richardcochran@...il.com>
Subject: [PATCH 6.6 3/3] net: fec: make PPS channel configurable
From: Francesco Dolcini <francesco.dolcini@...adex.com>
Depending on the SoC where the FEC is integrated into the PPS channel
might be routed to different timer instances. Make this configurable
from the devicetree.
When the related DT property is not present fallback to the previous
default and use channel 0.
Reviewed-by: Frank Li <Frank.Li@....com>
Tested-by: Rafael Beims <rafael.beims@...adex.com>
Signed-off-by: Francesco Dolcini <francesco.dolcini@...adex.com>
Reviewed-by: Csókás, Bence <csokas.bence@...lan.hu>
Signed-off-by: Paolo Abeni <pabeni@...hat.com>
(cherry picked from commit 566c2d83887f0570056833102adc5b88e681b0c7)
Signed-off-by: Csókás, Bence <csokas.bence@...lan.hu>
---
drivers/net/ethernet/freescale/fec_ptp.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
index 37e1c895f1b8..7f6b57432071 100644
--- a/drivers/net/ethernet/freescale/fec_ptp.c
+++ b/drivers/net/ethernet/freescale/fec_ptp.c
@@ -523,8 +523,6 @@ static int fec_ptp_enable(struct ptp_clock_info *ptp,
unsigned long flags;
int ret = 0;
- fep->pps_channel = DEFAULT_PPS_CHANNEL;
-
if (rq->type == PTP_CLK_REQ_PPS) {
fep->reload_period = PPS_OUPUT_RELOAD_PERIOD;
@@ -706,12 +704,16 @@ void fec_ptp_init(struct platform_device *pdev, int irq_idx)
{
struct net_device *ndev = platform_get_drvdata(pdev);
struct fec_enet_private *fep = netdev_priv(ndev);
+ struct device_node *np = fep->pdev->dev.of_node;
int irq;
int ret;
fep->ptp_caps.owner = THIS_MODULE;
strscpy(fep->ptp_caps.name, "fec ptp", sizeof(fep->ptp_caps.name));
+ fep->pps_channel = DEFAULT_PPS_CHANNEL;
+ of_property_read_u32(np, "fsl,pps-channel", &fep->pps_channel);
+
fep->ptp_caps.max_adj = 250000000;
fep->ptp_caps.n_alarm = 0;
fep->ptp_caps.n_ext_ts = 0;
--
2.34.1
Powered by blists - more mailing lists