From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [78.32.30.218]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7BD8930F958 for ; Mon, 26 Jan 2026 11:46:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=78.32.30.218 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769427963; cv=none; b=s3qcKPGz2T/vFHQ42jHyyf/rwvhmNNyXarZTDMYSUQdgo7JJ78v7CueHmW5c3mOJJMnVTB846//1m1omYyvVnbmvMndgMTWDnQmpcWDG/Dv0KOp3p3ERJVUnVevYzVKSj6j9imDaacC5VIKsppHgyNh8EoAaTV0x/pJfWjAjHPo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769427963; c=relaxed/simple; bh=k3pseoOdeyKK2+BfSkjiAP2BiD0EzSG4nSkk7iEOMdQ=; h=In-Reply-To:References:From:To:Cc:Subject:MIME-Version: Content-Disposition:Content-Type:Message-Id:Date; b=JrFg9DW/1o78DdjEhBEcpPTZPQt4vat6lgIWXQT2qNJQ0CyjbwDUFf+/9TRbsPCnIA/6989veD8fC1qS6d9MpTBgAfIAU1RaEVQJmRA213Gr5wUpW4GdyhkiA7QPlTpT39bOp0OQF+efvRof9aZgyzcXCoxrNFDnioyz9IsFszM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk; spf=none smtp.mailfrom=armlinux.org.uk; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b=YxtBBEa1; arc=none smtp.client-ip=78.32.30.218 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="YxtBBEa1" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=1Q6c8citotFNz5NVcBpc24Lya4NTXIqomAwdpmQQyEM=; b=YxtBBEa1+TTIxLXx+BY/ifOruq HAkWg3TjK+kXNPlDK62SAh2z3wVttgQnVASz6AzprYT5J7WJWMoJaVijbKNCia8ASiiED0byRMlZj 7iubg2nDIB3zZHVJJRaoKYitEQ6sbO/AJwOXSStBkcI1L4GVauu1ZGtP7/rQtfV+Eo+So2QNA9A+V igV6D23EzPNnFEt+t4u32d5MBjlLXcOvfd9NMLkVzwn9MCDtN12141b1l6HiDMQvFCT1dB7WdLDY8 uGPMlR23mmN54gAthZ0nV/j/ti0KQ6KvuAofl+EDDkZ/rc6AtfTzDBmdTBuwrWkLoJ4X0zNQzD+97 a77pUJeg==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:36664 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1vkL2U-000000004gA-1JYE; Mon, 26 Jan 2026 11:45:50 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.98.2) (envelope-from ) id 1vkL2T-00000005ut6-0rnf; Mon, 26 Jan 2026 11:45:49 +0000 In-Reply-To: References: From: "Russell King (Oracle)" To: Andrew Lunn Cc: Alexandre Torgue , Andrew Lunn , "David S. Miller" , Eric Dumazet , Heiko Stuebner , Jakub Kicinski , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, netdev@vger.kernel.org, Paolo Abeni Subject: [PATCH net-next v2 10/22] net: stmmac: rk: convert rk3588 to rk_set_reg_speed() Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: Sender: Russell King Date: Mon, 26 Jan 2026 11:45:49 +0000 Update rk_set_reg_speed() to use either the grf or php_grf regmap depending on the SoC's requirements and convert rk3588, removing its custom code. Signed-off-by: Russell King (Oracle) --- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 63 ++++++++++--------- 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index cdeb77aee642..baf41d15eea3 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -53,6 +53,7 @@ struct rk_gmac_ops { u16 clock_grf_reg; bool gmac_grf_reg_in_php; + bool clock_grf_reg_in_php; bool php_grf_required; bool regs_valid; u32 regs[]; @@ -145,7 +146,14 @@ static int rk_write_gmac_grf_reg(struct rk_priv_data *bsp_priv, u32 val) static int rk_write_clock_grf_reg(struct rk_priv_data *bsp_priv, u32 val) { - return regmap_write(bsp_priv->grf, bsp_priv->clock_grf_reg, val); + struct regmap *regmap; + + if (bsp_priv->ops->clock_grf_reg_in_php) + regmap = bsp_priv->php_grf; + else + regmap = bsp_priv->grf; + + return regmap_write(regmap, bsp_priv->clock_grf_reg, val); } static int rk_set_reg_speed(struct rk_priv_data *bsp_priv, @@ -1338,39 +1346,33 @@ static void rk3588_set_to_rmii(struct rk_priv_data *bsp_priv) RK3588_GMAC_CLK_RMII_MODE(bsp_priv->id)); } +static const struct rk_reg_speed_data rk3588_gmac0_speed_data = { + .rgmii_10 = RK3588_GMAC_CLK_RGMII(0, GMAC_CLK_DIV50_2_5M), + .rgmii_100 = RK3588_GMAC_CLK_RGMII(0, GMAC_CLK_DIV5_25M), + .rgmii_1000 = RK3588_GMAC_CLK_RGMII(0, GMAC_CLK_DIV1_125M), + .rmii_10 = RK3588_GMA_CLK_RMII_DIV20(0), + .rmii_100 = RK3588_GMA_CLK_RMII_DIV2(0), +}; + +static const struct rk_reg_speed_data rk3588_gmac1_speed_data = { + .rgmii_10 = RK3588_GMAC_CLK_RGMII(1, GMAC_CLK_DIV50_2_5M), + .rgmii_100 = RK3588_GMAC_CLK_RGMII(1, GMAC_CLK_DIV5_25M), + .rgmii_1000 = RK3588_GMAC_CLK_RGMII(1, GMAC_CLK_DIV1_125M), + .rmii_10 = RK3588_GMA_CLK_RMII_DIV20(1), + .rmii_100 = RK3588_GMA_CLK_RMII_DIV2(1), +}; + static int rk3588_set_gmac_speed(struct rk_priv_data *bsp_priv, phy_interface_t interface, int speed) { - unsigned int val = 0, id = bsp_priv->id; - - switch (speed) { - case 10: - if (interface == PHY_INTERFACE_MODE_RMII) - val = RK3588_GMA_CLK_RMII_DIV20(id); - else - val = RK3588_GMAC_CLK_RGMII(id, GMAC_CLK_DIV50_2_5M); - break; - case 100: - if (interface == PHY_INTERFACE_MODE_RMII) - val = RK3588_GMA_CLK_RMII_DIV2(id); - else - val = RK3588_GMAC_CLK_RGMII(id, GMAC_CLK_DIV5_25M); - break; - case 1000: - if (interface != PHY_INTERFACE_MODE_RMII) - val = RK3588_GMAC_CLK_RGMII(id, GMAC_CLK_DIV1_125M); - else - goto err; - break; - default: - goto err; - } + const struct rk_reg_speed_data *rsd; - regmap_write(bsp_priv->php_grf, RK3588_GRF_CLK_CON1, val); + if (bsp_priv->id == 0) + rsd = &rk3588_gmac0_speed_data; + else + rsd = &rk3588_gmac1_speed_data; - return 0; -err: - return -EINVAL; + return rk_set_reg_speed(bsp_priv, rsd, interface, speed); } static void rk3588_set_clock_selection(struct rk_priv_data *bsp_priv, bool input, @@ -1395,6 +1397,9 @@ static const struct rk_gmac_ops rk3588_ops = { .gmac_grf_reg_in_php = true, .gmac_grf_reg = RK3588_GRF_GMAC_CON0, + .clock_grf_reg_in_php = true, + .clock_grf_reg = RK3588_GRF_CLK_CON1, + .php_grf_required = true, .regs_valid = true, .regs = { -- 2.47.3