| Message ID | 20241205-upstream_s32cc_gmac-v8-10-ec1d180df815@oss.nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 04207d28f46870df113112a4afc42458495837d6 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Add support for Synopsis DWMAC IP on NXP Automotive SoCs S32G2xx/S32G3xx/S32R45 | expand |
On 05/12/2024 at 17:43, Jan Petrous via B4 Relay wrote: > From: "Jan Petrous (OSS)" <jan.petrous@oss.nxp.com> > > Utilize a new helper function rgmii_clock(). > > Reviewed-by: Andrew Lunn <andrew@lunn.ch> > Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> > Signed-off-by: Jan Petrous (OSS) <jan.petrous@oss.nxp.com> If needed: Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> Thanks, best regards, Nicolas > --- > drivers/net/ethernet/cadence/macb_main.c | 14 ++------------ > 1 file changed, 2 insertions(+), 12 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c > index daa416fb1724..640f500f989d 100644 > --- a/drivers/net/ethernet/cadence/macb_main.c > +++ b/drivers/net/ethernet/cadence/macb_main.c > @@ -530,19 +530,9 @@ static void macb_set_tx_clk(struct macb *bp, int speed) > if (bp->phy_interface == PHY_INTERFACE_MODE_MII) > return; > > - switch (speed) { > - case SPEED_10: > - rate = 2500000; > - break; > - case SPEED_100: > - rate = 25000000; > - break; > - case SPEED_1000: > - rate = 125000000; > - break; > - default: > + rate = rgmii_clock(speed); > + if (rate < 0) > return; > - } > > rate_rounded = clk_round_rate(bp->tx_clk, rate); > if (rate_rounded < 0) > > -- > 2.47.0 > >
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index daa416fb1724..640f500f989d 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -530,19 +530,9 @@ static void macb_set_tx_clk(struct macb *bp, int speed) if (bp->phy_interface == PHY_INTERFACE_MODE_MII) return; - switch (speed) { - case SPEED_10: - rate = 2500000; - break; - case SPEED_100: - rate = 25000000; - break; - case SPEED_1000: - rate = 125000000; - break; - default: + rate = rgmii_clock(speed); + if (rate < 0) return; - } rate_rounded = clk_round_rate(bp->tx_clk, rate); if (rate_rounded < 0)