drivers: mdio: remove mdio_bus_enable/mdio_bus_disable

maass-hamburg · maass-hamburg · commit 03be2b233394 · 2025-11-19T18:40:48.000+01:00
remove mdio_bus_enable/mdio_bus_disable, as they are no
longer needed and make the mdio api simpler.

Signed-off-by: Fin Maaß &lt;f.maass@vogl-electronic.com&gt;
diff --git a/drivers/ethernet/phy/phy_adin2111.c b/drivers/ethernet/phy/phy_adin2111.c
@@ -187,31 +187,13 @@ static int phy_adin2111_c45_write(const struct device *dev, uint16_t devad,
 static int phy_adin2111_reg_read(const struct device *dev, uint16_t reg_addr,
 				 uint32_t *data)
 {
-	const struct phy_adin2111_config *cfg = dev->config;
-	int ret;
-
-	mdio_bus_enable(cfg->mdio);
-
-	ret = phy_adin2111_c22_read(dev, reg_addr, (uint16_t *) data);
-
-	mdio_bus_disable(cfg->mdio);
-
-	return ret;
+	return phy_adin2111_c22_read(dev, reg_addr, (uint16_t *) data);
 }
 
 static int phy_adin2111_reg_write(const struct device *dev, uint16_t reg_addr,
 				  uint32_t data)
 {
-	const struct phy_adin2111_config *cfg = dev->config;
-	int ret;
-
-	mdio_bus_enable(cfg->mdio);
-
-	ret = phy_adin2111_c22_write(dev, reg_addr, (uint16_t) data);
-
-	mdio_bus_disable(cfg->mdio);
-
-	return ret;
+	return phy_adin2111_c22_write(dev, reg_addr, (uint16_t) data);
 }
 
 static int phy_adin2111_await_phy(const struct device *dev)
diff --git a/drivers/ethernet/phy/phy_microchip_ksz8081.c b/drivers/ethernet/phy/phy_microchip_ksz8081.c
@@ -681,8 +681,6 @@ static int phy_mc_ksz8081_init(const struct device *dev)
 		return ret;
 	}
 
-	mdio_bus_enable(config->mdio_dev);
-
 	ret = ksz8081_init_reset_gpios(dev);
 	if (ret) {
 		return ret;
diff --git a/drivers/ethernet/phy/phy_microchip_ksz9131.c b/drivers/ethernet/phy/phy_microchip_ksz9131.c
@@ -550,8 +550,6 @@ static int phy_mchp_ksz9131_init(const struct device *dev)
 	data->dev = dev;
 	data->cb = NULL;
 
-	mdio_bus_enable(cfg->mdio);
-
 	ret = phy_mchp_ksz9131_reset(dev);
 	if (ret < 0) {
 		return ret;
diff --git a/drivers/ethernet/phy/phy_microchip_lan8742.c b/drivers/ethernet/phy/phy_microchip_lan8742.c
@@ -389,8 +389,6 @@ static int phy_lan8742_init(const struct device *dev)
 		return -ENODEV;
 	}
 
-	mdio_bus_enable(cfg->mdio);
-
 	ret = phy_lan8742_reset(dev);
 	if (ret < 0) {
 		LOG_ERR("Failed to reset PHY (%d): %d", cfg->phy_addr, ret);
diff --git a/drivers/ethernet/phy/phy_microchip_t1s.c b/drivers/ethernet/phy/phy_microchip_t1s.c
@@ -135,32 +135,18 @@ struct mc_t1s_data {
 static int phy_mc_t1s_read(const struct device *dev, uint16_t reg, uint32_t *data)
 {
 	const struct mc_t1s_config *cfg = dev->config;
-	int ret;
 
 	/* Make sure excessive bits 16-31 are reset */
 	*data = 0U;
 
-	mdio_bus_enable(cfg->mdio);
-
-	ret = mdio_read(cfg->mdio, cfg->phy_addr, reg, (uint16_t *)data);
-
-	mdio_bus_disable(cfg->mdio);
-
-	return ret;
+	return mdio_read(cfg->mdio, cfg->phy_addr, reg, (uint16_t *)data);
 }
 
 static int phy_mc_t1s_write(const struct device *dev, uint16_t reg, uint32_t data)
 {
 	const struct mc_t1s_config *cfg = dev->config;
-	int ret;
-
-	mdio_bus_enable(cfg->mdio);
-
-	ret = mdio_write(cfg->mdio, cfg->phy_addr, reg, (uint16_t)data);
 
-	mdio_bus_disable(cfg->mdio);
-
-	return ret;
+	return mdio_write(cfg->mdio, cfg->phy_addr, reg, (uint16_t)data);
 }
 
 static int mdio_setup_c45_indirect_access(const struct device *dev, uint16_t devad, uint16_t reg)
@@ -192,20 +178,13 @@ static int phy_mc_t1s_c45_read(const struct device *dev, uint8_t devad, uint16_t
 		return mdio_read_c45(cfg->mdio, cfg->phy_addr, devad, reg, val);
 	}
 
-	mdio_bus_enable(cfg->mdio);
-
 	/* Read C45 registers using C22 indirect access registers */
 	ret = mdio_setup_c45_indirect_access(dev, devad, reg);
 	if (ret < 0) {
-		mdio_bus_disable(cfg->mdio);
 		return ret;
 	}
 
-	ret = mdio_read(cfg->mdio, cfg->phy_addr, MII_MMD_AADR, val);
-
-	mdio_bus_disable(cfg->mdio);
-
-	return ret;
+	return mdio_read(cfg->mdio, cfg->phy_addr, MII_MMD_AADR, val);
 }
 
 static int phy_mc_t1s_c45_write(const struct device *dev, uint8_t devad, uint16_t reg, uint16_t val)
@@ -219,20 +198,13 @@ static int phy_mc_t1s_c45_write(const struct device *dev, uint8_t devad, uint16_
 		return mdio_write_c45(cfg->mdio, cfg->phy_addr, devad, reg, val);
 	}
 
-	mdio_bus_enable(cfg->mdio);
-
 	/* Write C45 registers using C22 indirect access registers */
 	ret = mdio_setup_c45_indirect_access(dev, devad, reg);
 	if (ret < 0) {
-		mdio_bus_disable(cfg->mdio);
 		return ret;
 	}
 
-	ret = mdio_write(cfg->mdio, cfg->phy_addr, MII_MMD_AADR, val);
-
-	mdio_bus_disable(cfg->mdio);
-
-	return ret;
+	return mdio_write(cfg->mdio, cfg->phy_addr, MII_MMD_AADR, val);
 }
 
 static int phy_mc_t1s_get_link(const struct device *dev, struct phy_link_state *state)
diff --git a/drivers/ethernet/phy/phy_microchip_vsc8541.c b/drivers/ethernet/phy/phy_microchip_vsc8541.c
@@ -442,7 +442,6 @@ static int phy_mc_vsc8541_read(const struct device *dev, uint16_t reg_addr, uint
 	reg_addr &= 0x00ff;
 
 	k_mutex_lock(&dev_data->mutex, K_FOREVER);
-	mdio_bus_enable(cfg->mdio_dev);
 
 	/* select page, given by register upper byte */
 	if (dev_data->active_page != page) {
@@ -457,7 +456,6 @@ static int phy_mc_vsc8541_read(const struct device *dev, uint16_t reg_addr, uint
 	ret = mdio_read(cfg->mdio_dev, cfg->addr, reg_addr, data);
 
 read_end:
-	mdio_bus_disable(cfg->mdio_dev);
 	k_mutex_unlock(&dev_data->mutex);
 
 	return ret;
@@ -493,7 +491,6 @@ static int phy_mc_vsc8541_write(const struct device *dev, uint16_t reg_addr, uin
 	reg_addr &= 0x00ff;
 
 	k_mutex_lock(&dev_data->mutex, K_FOREVER);
-	mdio_bus_enable(cfg->mdio_dev);
 
 	/* select page, given by register upper byte */
 	if (dev_data->active_page != page) {
@@ -508,7 +505,6 @@ static int phy_mc_vsc8541_write(const struct device *dev, uint16_t reg_addr, uin
 	ret = mdio_write(cfg->mdio_dev, cfg->addr, reg_addr, data);
 
 write_end:
-	mdio_bus_disable(cfg->mdio_dev);
 	k_mutex_unlock(&dev_data->mutex);
 
 	return ret;
diff --git a/drivers/ethernet/phy/phy_mii.c b/drivers/ethernet/phy/phy_mii.c
@@ -499,8 +499,6 @@ static int phy_mii_initialize_dynamic_link(const struct device *dev)
 
 	data->state.is_up = false;
 
-	mdio_bus_enable(cfg->mdio);
-
 	if (cfg->no_reset == false) {
 		ret = reset(dev);
 		if (ret < 0) {
diff --git a/drivers/ethernet/phy/phy_motorcomm_yt8521.c b/drivers/ethernet/phy/phy_motorcomm_yt8521.c
@@ -532,8 +532,6 @@ static int mc_ytphy_init(const struct device *dev)
 
 	k_sem_init(&data->sem, 1, 1);
 
-	mdio_bus_enable(config->mdio);
-
 	data->state.is_up = false;
 	data->dev = dev;
 	data->cb = NULL;
diff --git a/drivers/ethernet/phy/phy_qualcomm_ar8031.c b/drivers/ethernet/phy/phy_qualcomm_ar8031.c
@@ -327,8 +327,6 @@ static int qc_ar8031_init(const struct device *dev)
 
 	k_sem_init(&data->sem, 1, 1);
 
-	mdio_bus_enable(cfg->mdio_dev);
-
 	data->state.is_up = false;
 
 	data->dev = dev;
diff --git a/drivers/ethernet/phy/phy_realtek_rtl8211f.c b/drivers/ethernet/phy/phy_realtek_rtl8211f.c
@@ -452,8 +452,6 @@ static int phy_rt_rtl8211f_init(const struct device *dev)
 		return ret;
 	}
 
-	mdio_bus_enable(config->mdio_dev);
-
 #if DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios)
 	/* Configure reset pin */
 	if (config->reset_gpio.port) {
diff --git a/drivers/ethernet/phy/phy_ti_dp83825.c b/drivers/ethernet/phy/phy_ti_dp83825.c
@@ -496,8 +496,6 @@ static int phy_ti_dp83825_init(const struct device *dev)
 		return ret;
 	}
 
-	mdio_bus_enable(config->mdio_dev);
-
 #if DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios)
 	if (config->reset_gpio.port) {
 		ret = gpio_pin_configure_dt(&config->reset_gpio, GPIO_OUTPUT_INACTIVE);
diff --git a/drivers/ethernet/phy/phy_ti_dp83867.c b/drivers/ethernet/phy/phy_ti_dp83867.c
@@ -467,8 +467,6 @@ static int phy_ti_dp83867_init(const struct device *dev)
 		return ret;
 	}
 
-	mdio_bus_enable(config->mdio_dev);
-
 #if DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios)
 	if (config->reset_gpio.port) {
 		ret = gpio_pin_configure_dt(&config->reset_gpio, GPIO_OUTPUT_INACTIVE);
diff --git a/drivers/ethernet/phy/phy_tja1103.c b/drivers/ethernet/phy/phy_tja1103.c
@@ -113,29 +113,15 @@ static inline int phy_tja1103_c45_read(const struct device *dev, uint16_t devad,
 static int phy_tja1103_reg_read(const struct device *dev, uint16_t reg_addr, uint32_t *data)
 {
 	const struct phy_tja1103_config *cfg = dev->config;
-	int ret;
-
-	mdio_bus_enable(cfg->mdio);
-
-	ret = phy_tja1103_c22_read(dev, reg_addr, (uint16_t *)data);
 
-	mdio_bus_disable(cfg->mdio);
-
-	return ret;
+	return phy_tja1103_c22_read(dev, reg_addr, (uint16_t *)data);
 }
 
 static int phy_tja1103_reg_write(const struct device *dev, uint16_t reg_addr, uint32_t data)
 {
 	const struct phy_tja1103_config *cfg = dev->config;
-	int ret;
-
-	mdio_bus_enable(cfg->mdio);
-
-	ret = phy_tja1103_c22_write(dev, reg_addr, (uint16_t)data);
 
-	mdio_bus_disable(cfg->mdio);
-
-	return ret;
+	return phy_tja1103_c22_write(dev, reg_addr, (uint16_t)data);
 }
 
 static int phy_tja1103_id(const struct device *dev, uint32_t *phy_id)
diff --git a/drivers/ethernet/phy/phy_tja11xx.c b/drivers/ethernet/phy/phy_tja11xx.c
@@ -58,30 +58,12 @@ static inline int phy_tja11xx_c22_write(const struct device *dev, uint16_t reg,
 
 static int phy_tja11xx_reg_read(const struct device *dev, uint16_t reg_addr, uint32_t *data)
 {
-	const struct phy_tja11xx_config *cfg = dev->config;
-	int ret;
-
-	mdio_bus_enable(cfg->mdio);
-
-	ret = phy_tja11xx_c22_read(dev, reg_addr, (uint16_t *)data);
-
-	mdio_bus_disable(cfg->mdio);
-
-	return ret;
+	return phy_tja11xx_c22_read(dev, reg_addr, (uint16_t *)data);
 }
 
 static int phy_tja11xx_reg_write(const struct device *dev, uint16_t reg_addr, uint32_t data)
 {
-	const struct phy_tja11xx_config *cfg = dev->config;
-	int ret;
-
-	mdio_bus_enable(cfg->mdio);
-
-	ret = phy_tja11xx_c22_write(dev, reg_addr, (uint16_t)data);
-
-	mdio_bus_disable(cfg->mdio);
-
-	return ret;
+	return phy_tja11xx_c22_write(dev, reg_addr, (uint16_t)data);
 }
 
 static int update_link_state(const struct device *dev)
diff --git a/drivers/mdio/mdio_shell.c b/drivers/mdio/mdio_shell.c
@@ -76,8 +76,6 @@ static int cmd_mdio_scan(const struct shell *sh, size_t argc, char **argv)
 		    reg_addr);
 	cnt = 0;
 
-	mdio_bus_enable(dev);
-
 	for (int i = 0; i < 32; i++) {
 		data = 0;
 		if (mdio_read(dev, i, reg_addr, &data) >= 0 &&
@@ -87,8 +85,6 @@ static int cmd_mdio_scan(const struct shell *sh, size_t argc, char **argv)
 		}
 	}
 
-	mdio_bus_disable(dev);
-
 	shell_print(sh, "%u devices found on %s", cnt, dev->name);
 
 	return 0;
@@ -112,17 +108,12 @@ static int cmd_mdio_write(const struct shell *sh, size_t argc, char **argv)
 	reg_addr = strtol(argv[3], NULL, 16);
 	data = strtol(argv[4], NULL, 16);
 
-	mdio_bus_enable(dev);
-
 	if (mdio_write(dev, port_addr, reg_addr, data) < 0) {
 		shell_error(sh, "Failed to write to device: %s", dev->name);
-		mdio_bus_disable(dev);
 
 		return -EIO;
 	}
 
-	mdio_bus_disable(dev);
-
 	return 0;
 }
 
@@ -143,17 +134,12 @@ static int cmd_mdio_read(const struct shell *sh, size_t argc, char **argv)
 	port_addr = strtol(argv[2], NULL, 16);
 	reg_addr = strtol(argv[3], NULL, 16);
 
-	mdio_bus_enable(dev);
-
 	if (mdio_read(dev, port_addr, reg_addr, &data) < 0) {
 		shell_error(sh, "Failed to read from device: %s", dev->name);
-		mdio_bus_disable(dev);
 
 		return -EIO;
 	}
 
-	mdio_bus_disable(dev);
-
 	shell_print(sh, "%x[%x]: 0x%x", port_addr, reg_addr, data);
 
 	return 0;
@@ -179,17 +165,12 @@ static int cmd_mdio_write_45(const struct shell *sh, size_t argc, char **argv)
 	reg_addr = strtol(argv[4], NULL, 16);
 	data = strtol(argv[5], NULL, 16);
 
-	mdio_bus_enable(dev);
-
 	if (mdio_write_c45(dev, port_addr, dev_addr, reg_addr, data) < 0) {
 		shell_error(sh, "Failed to write to device: %s", dev->name);
-		mdio_bus_disable(dev);
 
 		return -EIO;
 	}
 
-	mdio_bus_disable(dev);
-
 	return 0;
 }
 
@@ -212,17 +193,12 @@ static int cmd_mdio_read_c45(const struct shell *sh, size_t argc, char **argv)
 	dev_addr = strtol(argv[3], NULL, 16);
 	reg_addr = strtol(argv[4], NULL, 16);
 
-	mdio_bus_enable(dev);
-
 	if (mdio_read_c45(dev, port_addr, dev_addr, reg_addr, &data) < 0) {
 		shell_error(sh, "Failed to read from device: %s", dev->name);
-		mdio_bus_disable(dev);
 
 		return -EIO;
 	}
 
-	mdio_bus_disable(dev);
-
 	shell_print(sh, "%x[%x:%x]: 0x%x", port_addr, dev_addr, reg_addr, data);
 
 	return 0;
diff --git a/include/zephyr/drivers/mdio.h b/include/zephyr/drivers/mdio.h

Original file line number	Diff line number	Diff line change
`@@ -681,8 +681,6 @@ static int phy_mc_ksz8081_init(const struct device *dev)`
`681`	`681`	`return ret;`
`682`	`682`	`}`
`683`	`683`
`684`		`- mdio_bus_enable(config->mdio_dev);`
`685`		`-`
`686`	`684`	`ret = ksz8081_init_reset_gpios(dev);`
`687`	`685`	`if (ret) {`
`688`	`686`	`return ret;`
Original file line number	Diff line number	Diff line change
`@@ -389,8 +389,6 @@ static int phy_lan8742_init(const struct device *dev)`
`389`	`389`	`return -ENODEV;`
`390`	`390`	`}`
`391`	`391`
`392`		`- mdio_bus_enable(cfg->mdio);`
`393`		`-`
`394`	`392`	`ret = phy_lan8742_reset(dev);`
`395`	`393`	`if (ret < 0) {`
`396`	`394`	`LOG_ERR("Failed to reset PHY (%d): %d", cfg->phy_addr, ret);`
Original file line number	Diff line number	Diff line change
`@@ -452,8 +452,6 @@ static int phy_rt_rtl8211f_init(const struct device *dev)`
`452`	`452`	`return ret;`
`453`	`453`	`}`
`454`	`454`
`455`		`- mdio_bus_enable(config->mdio_dev);`
`456`		`-`
`457`	`455`	`#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios)`
`458`	`456`	`/* Configure reset pin */`
`459`	`457`	`if (config->reset_gpio.port) {`