openwrt-mirror/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2026-06-17 14:50:15 +04:00
Code Issues Packages Projects Releases Wiki Activity

realtek: mdio: simplify regmap_update_bits

Browse Source 
Some occurrences of regmap_update_bits can be simplified by
using other regmap commands. Use set_bits/clear_bits/assign_bits
for better readability.

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/23039
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Markus Stockhausen
2026-04-21 21:50:17 +02:00
committed by Robert Marko
parent 6ce041be4b
commit 77ddfcfbcb
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
target/linux/realtek/files-6.18/drivers/net/mdio/mdio-realtek-otto.c
+4 -7
View File
@@ -701,16 +701,13 @@ static int rtmdio_838x_setup_ctrl(struct rtmdio_ctrl *ctrl)
* PHY_PATCH_DONE enables phy control via SoC. This is required for phy access, * PHY_PATCH_DONE enables phy control via SoC. This is required for phy access,
* including patching. Must always be set before the phys are probed. * including patching. Must always be set before the phys are probed.
*/ */
regmap_update_bits(ctrl->map, RTMDIO_838X_SMI_GLB_CTRL, regmap_set_bits(ctrl->map, RTMDIO_838X_SMI_GLB_CTRL, RTMDIO_838X_PHY_PATCH_DONE);
RTMDIO_838X_PHY_PATCH_DONE, RTMDIO_838X_PHY_PATCH_DONE);
return 0; return 0;
} }
static void rtmdio_838x_setup_polling(struct rtmdio_ctrl *ctrl) static void rtmdio_838x_setup_polling(struct rtmdio_ctrl *ctrl)
{ {
int combo_phy;
/* Disable MAC polling for PHY config. It will be activated later in the DSA driver */ /* Disable MAC polling for PHY config. It will be activated later in the DSA driver */
regmap_write(ctrl->map, RTMDIO_838X_SMI_POLL_CTRL, 0); regmap_write(ctrl->map, RTMDIO_838X_SMI_POLL_CTRL, 0);
@@ -720,8 +717,8 @@ static void rtmdio_838x_setup_polling(struct rtmdio_ctrl *ctrl)
* give the real media status (0=copper, 1=fibre). For now assume that if address 24 is * give the real media status (0=copper, 1=fibre). For now assume that if address 24 is
* PHY driven, it must be a combo PHY and media detection is needed. * PHY driven, it must be a combo PHY and media detection is needed.
*/ */
combo_phy = test_bit(24, ctrl->valid_ports) ? BIT(7) : 0; regmap_assign_bits(ctrl->map, RTMDIO_838X_SMI_GLB_CTRL, BIT(7),
regmap_update_bits(ctrl->map, RTMDIO_838X_SMI_GLB_CTRL, BIT(7), combo_phy); test_bit(24, ctrl->valid_ports));
} }
static int rtmdio_839x_setup_ctrl(struct rtmdio_ctrl *ctrl) static int rtmdio_839x_setup_ctrl(struct rtmdio_ctrl *ctrl)
@@ -734,7 +731,7 @@ static int rtmdio_839x_setup_ctrl(struct rtmdio_ctrl *ctrl)
regmap_write(ctrl->map, RTMDIO_839X_SMI_PORT_POLLING_CTRL, 0); regmap_write(ctrl->map, RTMDIO_839X_SMI_PORT_POLLING_CTRL, 0);
regmap_write(ctrl->map, RTMDIO_839X_SMI_PORT_POLLING_CTRL + 4, 0); regmap_write(ctrl->map, RTMDIO_839X_SMI_PORT_POLLING_CTRL + 4, 0);
/* Disable PHY polling via SoC */ /* Disable PHY polling via SoC */
regmap_update_bits(ctrl->map, RTMDIO_839X_SMI_GLB_CTRL, BIT(7), 0); regmap_clear_bits(ctrl->map, RTMDIO_839X_SMI_GLB_CTRL, BIT(7));
/* Probably should reset all PHYs here... */ /* Probably should reset all PHYs here... */
return 0; return 0;