diff options
author | Paolo Abeni <pabeni@redhat.com> | 2023-11-23 12:02:52 +0100 |
---|---|---|
committer | Paolo Abeni <pabeni@redhat.com> | 2023-11-23 12:05:44 +0100 |
commit | 7490a42020bb1648337ebf04bf6e1ff9d8883f6b (patch) | |
tree | 647e5256689579de09d656d7e947f372e030aca2 /drivers/net/ethernet/renesas/rswitch.c | |
parent | 750011e239a50873251c16207b0fe78eabf8577e (diff) | |
parent | 8c1c66235e0354fbe8c2159656947fad048d374d (diff) |
Merge branch 'net-ethernet-renesas-rcar_gen4_ptp-add-v4h-support'
Niklas Söderlund says:
====================
net: ethernet: renesas: rcar_gen4_ptp: Add V4H support
This small series prepares the rcar_gen4_ptp to be useable both on both
R-Car S4 and V4H. The only in-tree driver that make use of this is
rswtich on S4. A new Ethernet (R-Car Ethernet TSN) driver for V4H is on
it's way that also will make use of rcar_gen4_ptp functionality.
Patch 1-2 are small improvements to the existing driver. While patch 3-4
adds V4H support. Finally patch 5 turns rcar_gen4_ptp into a separate
module to allow the gPTP functionality to be shared between the two
users without having to duplicate the code in each.
See each patch for changelog.
====================
Link: https://lore.kernel.org/r/20231121155306.515446-1-niklas.soderlund+renesas@ragnatech.se
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers/net/ethernet/renesas/rswitch.c')
-rw-r--r-- | drivers/net/ethernet/renesas/rswitch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/renesas/rswitch.c index 43a7795d6591..d6089429f654 100644 --- a/drivers/net/ethernet/renesas/rswitch.c +++ b/drivers/net/ethernet/renesas/rswitch.c @@ -1828,8 +1828,8 @@ static int rswitch_init(struct rswitch_private *priv) rswitch_fwd_init(priv); - err = rcar_gen4_ptp_register(priv->ptp_priv, RCAR_GEN4_PTP_REG_LAYOUT_S4, - RCAR_GEN4_PTP_CLOCK_S4); + err = rcar_gen4_ptp_register(priv->ptp_priv, RCAR_GEN4_PTP_REG_LAYOUT, + clk_get_rate(priv->clk)); if (err < 0) goto err_ptp_register; |