From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
To: Andrew Lunn <andrew@lunn.ch>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
linux-arm-kernel@lists.infradead.org,
linux-arm-msm@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
Mohd Ayaan Anwar <mohd.anwar@oss.qualcomm.com>,
netdev@vger.kernel.org, Paolo Abeni <pabeni@redhat.com>
Subject: [PATCH net-next 12/15] net: stmmac: qcom-ethqos: simplify prg_rclk_dly programming
Date: Tue, 24 Mar 2026 13:12:30 +0000 [thread overview]
Message-ID: <E1w51Yc-0000000DwWM-3REd@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <acKNcX5PqtWYf8m3@shell.armlinux.org.uk>
Rather than coding the entire register update twice with different
values, use a local variable to specify the value and have one
register update statement that uses this local variable. This results
in neater code.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index c88c693137d6..f9d6e97f197a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -374,6 +374,7 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos)
static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
{
struct device *dev = ðqos->pdev->dev;
+ unsigned int prg_rclk_dly;
int phase_shift;
int loopback;
@@ -461,16 +462,16 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
*/
if (ethqos->has_emac_ge_3) {
/* 0.9 ns */
- rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_RCLK_DLY,
- FIELD_PREP(SDCC_DDR_CONFIG_PRG_RCLK_DLY,
- 115), SDCC_HC_REG_DDR_CONFIG);
+ prg_rclk_dly = 115;
} else {
/* 1.8 ns */
- rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_RCLK_DLY,
- FIELD_PREP(SDCC_DDR_CONFIG_PRG_RCLK_DLY,
- 57), SDCC_HC_REG_DDR_CONFIG);
+ prg_rclk_dly = 57;
}
+ rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_RCLK_DLY,
+ FIELD_PREP(SDCC_DDR_CONFIG_PRG_RCLK_DLY,
+ prg_rclk_dly), SDCC_HC_REG_DDR_CONFIG);
+
rgmii_setmask(ethqos, SDCC_DDR_CONFIG_PRG_DLY_EN,
SDCC_HC_REG_DDR_CONFIG);
}
--
2.47.3
next prev parent reply other threads:[~2026-03-24 13:20 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-24 13:11 [PATCH net-next 00/15] net: stmmac: qcom-ethqos: more cleanups Russell King (Oracle)
2026-03-24 13:11 ` [PATCH net-next 01/15] net: stmmac: qcom-ethqos: remove ethqos_configure() Russell King (Oracle)
2026-03-24 13:11 ` [PATCH net-next 02/15] net: stmmac: qcom-ethqos: pass ethqos to ethqos_pcs_set_inband() Russell King (Oracle)
2026-03-24 13:11 ` [PATCH net-next 03/15] net: stmmac: qcom-ethqos: eliminate configure_func Russell King (Oracle)
2026-03-26 18:04 ` Simon Horman
2026-03-26 18:12 ` Russell King (Oracle)
2026-03-27 9:23 ` Simon Horman
2026-03-24 13:11 ` [PATCH net-next 04/15] net: stmmac: qcom-ethqos: move detection of invalid RGMII speed Russell King (Oracle)
2026-03-24 13:11 ` [PATCH net-next 05/15] net: stmmac: qcom-ethqos: move RGMII_CONFIG_DDR_MODE Russell King (Oracle)
2026-03-24 13:11 ` [PATCH net-next 06/15] net: stmmac: qcom-ethqos: move 1G vs 100M/10M RGMII settings Russell King (Oracle)
2026-03-24 13:12 ` [PATCH net-next 07/15] net: stmmac: qcom-ethqos: move two more RGMII_IO_MACRO_CONFIG2 out Russell King (Oracle)
2026-03-24 13:12 ` [PATCH net-next 08/15] net: stmmac: qcom-ethqos: move 100M/10M speed programming Russell King (Oracle)
2026-03-24 13:12 ` [PATCH net-next 09/15] net: stmmac: qcom-ethqos: move RGMII_CONFIG2_RSVD_CONFIG15 out Russell King (Oracle)
2026-03-24 13:12 ` [PATCH net-next 10/15] net: stmmac: qcom-ethqos: move RGMII_CONFIG2_RX_PROG_SWAP Russell King (Oracle)
2026-03-24 13:12 ` [PATCH net-next 11/15] net: stmmac: qcom-ethqos: finally eliminate the switch Russell King (Oracle)
2026-03-24 13:12 ` Russell King (Oracle) [this message]
2026-03-24 13:12 ` [PATCH net-next 13/15] net: stmmac: qcom-ethqos: move loopback decision next to reg update Russell King (Oracle)
2026-03-24 13:12 ` [PATCH net-next 14/15] net: stmmac: qcom-ethqos: correct prg_rclk_dly comment Russell King (Oracle)
2026-03-24 13:12 ` [PATCH net-next 15/15] net: stmmac: qcom-ethqos: move phase_shift to register update site Russell King (Oracle)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1w51Yc-0000000DwWM-3REd@rmk-PC.armlinux.org.uk \
--to=rmk+kernel@armlinux.org.uk \
--cc=alexandre.torgue@foss.st.com \
--cc=andrew+netdev@lunn.ch \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mohd.anwar@oss.qualcomm.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox