[openwrt/openwrt] realtek: mdio: drop family leftovers
LEDE Commits
lede-commits at lists.infradead.org
Mon Dec 29 03:57:15 PST 2025
robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/b8a596e40b64abadbe2d914c5102a897a39df1f7
commit b8a596e40b64abadbe2d914c5102a897a39df1f7
Author: Markus Stockhausen <markus.stockhausen at gmx.de>
AuthorDate: Wed Dec 24 13:05:01 2025 +0100
realtek: mdio: drop family leftovers
Now that the bus is completely configured by the dts
compatible, drop the hard coded family detection.
Signed-off-by: Markus Stockhausen <markus.stockhausen at gmx.de>
Link: https://github.com/openwrt/openwrt/pull/21274
Signed-off-by: Robert Marko <robimarko at gmail.com>
---
.../drivers/net/mdio/mdio-realtek-otto.c | 38 +---------------------
1 file changed, 1 insertion(+), 37 deletions(-)
diff --git a/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c b/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c
index 27200c074b..f0f3103291 100644
--- a/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c
+++ b/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c
@@ -12,11 +12,6 @@
#define RTMDIO_MAX_SMI_BUS 4
#define RTMDIO_PAGE_SELECT 0x1f
-#define RTMDIO_838X_FAMILY_ID 0x8380
-#define RTMDIO_839X_FAMILY_ID 0x8390
-#define RTMDIO_930X_FAMILY_ID 0x9300
-#define RTMDIO_931X_FAMILY_ID 0x9310
-
/* Register base */
#define RTMDIO_SW_BASE ((volatile void *) 0xBB000000)
@@ -74,10 +69,6 @@
#define RTMDIO_931X_SERDES_INDRT_ACCESS_CTRL (0x5638)
#define RTMDIO_931X_SERDES_INDRT_DATA_CTRL (0x563C)
-/* Other registers */
-#define RTMDIO_839X_MODEL_NAME_INFO_REG (0x0ff0)
-#define RTMDIO_93XX_MODEL_NAME_INFO_REG (0x0004)
-
#define sw_r32(reg) readl(RTMDIO_SW_BASE + reg)
#define sw_w32(val, reg) writel(val, RTMDIO_SW_BASE + reg)
#define sw_w32_mask(clear, set, reg) sw_w32((sw_r32(reg) & ~(clear)) | (set), reg)
@@ -153,8 +144,6 @@ DEFINE_MUTEX(rtmdio_lock_sds);
struct rtmdio_bus_priv {
const struct rtmdio_config *cfg;
- u16 id;
- u16 family_id;
int page[RTMDIO_MAX_PORT];
bool raw[RTMDIO_MAX_PORT];
int smi_bus[RTMDIO_MAX_PORT];
@@ -1390,39 +1379,14 @@ static int rtmdio_reset(struct mii_bus *bus)
return priv->cfg->reset(bus);
}
-/*
- * TODO: This is a tiny leftover from the central SoC include. For now try to detect the
- * Realtek SoC automatically. This needs to be changed to a proper DTS compatible in a
- * future driver version.
- */
-static int rtmdio_get_family(void)
-{
- unsigned int val;
-
- val = sw_r32(RTMDIO_93XX_MODEL_NAME_INFO_REG);
- if ((val & 0xfffc0000) == 0x93000000)
- return RTMDIO_930X_FAMILY_ID;
- if ((val & 0xfffc0000) == 0x93100000)
- return RTMDIO_931X_FAMILY_ID;
-
- val = sw_r32(RTMDIO_839X_MODEL_NAME_INFO_REG);
- if ((val & 0xfff80000) == 0x83900000)
- return RTMDIO_839X_FAMILY_ID;
-
- return RTMDIO_838X_FAMILY_ID;
-}
-
static int rtmdio_probe(struct platform_device *pdev)
{
struct device_node *dn, *mii_np, *pcs_node;
struct device *dev = &pdev->dev;
struct rtmdio_bus_priv *priv;
struct mii_bus *bus;
- int i, family;
u32 pn;
-
- family = rtmdio_get_family();
- dev_info(dev, "probing RTL%04x family mdio bus\n", family);
+ int i;
mii_np = of_get_child_by_name(dev->of_node, "mdio-bus");
if (!mii_np)
More information about the lede-commits
mailing list