Rename device_d::device_node to device_d::of_node

Linux struct device has the member of_node for the device_node pointer.
Rename this in barebox accordingly to minimize the necessary changes
when porting Linux code. This was done with the semantic patch:

@@ struct device_d E; @@
- E.device_node
+ E.of_node
@@ struct device_d *E; @@
- E->device_node
+ E->of_node

Plus some manual adjustments.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>
Link: https://lore.barebox.org/20221214123512.189688-2-s.hauer@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

32 files changed, 106 insertions, 102 deletions

diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index 8df5fd5dea..cc951c7ddb 100644
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -561,7 +561,7 @@ static int bcmgenet_probe(struct device_d *dev)
 		return -ENODEV;
 	}
 
-	ret = of_get_phy_mode(dev->device_node);
+	ret = of_get_phy_mode(dev->of_node);
 	if (ret < 0)
 		priv->interface = PHY_INTERFACE_MODE_MII;
 	else
@@ -579,8 +579,8 @@ static int bcmgenet_probe(struct device_d *dev)
 
 	priv->miibus.priv = priv;
 	priv->miibus.parent = dev;
-	priv->miibus.dev.device_node
-		= of_get_compatible_child(dev->device_node, "brcm,genet-mdio-v5");
+	priv->miibus.dev.of_node
+		= of_get_compatible_child(dev->of_node, "brcm,genet-mdio-v5");
 
 	ret = mdiobus_register(&priv->miibus);
 	if (ret)
diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c
index 73671ae2d4..ec464e5c03 100644
--- a/drivers/net/cpsw.c
+++ b/drivers/net/cpsw.c
@@ -1229,7 +1229,7 @@ static void cpsw_add_slave(struct cpsw_slave *slave, struct device_node *child,
 			dev_warn(slave->cpsw->dev, "phy_id is deprecated, use phy-handle\n");
 	}
 
-	slave->dev.device_node = child;
+	slave->dev.of_node = child;
 	slave->phy_id = phy_id[1];
 	slave->phy_if = of_get_phy_mode(child);
 	slave->slave_num = i;
@@ -1238,7 +1238,7 @@ static void cpsw_add_slave(struct cpsw_slave *slave, struct device_node *child,
 static int cpsw_legacy_probe_dt(struct cpsw_priv *priv)
 {
 	struct device_d *dev = priv->dev;
-	struct device_node *np = dev->device_node, *child;
+	struct device_node *np = dev->of_node, *child;
 	int ret, i = 0;
 
 	ret = of_property_read_u32(np, "slaves", &priv->num_slaves);
@@ -1266,7 +1266,7 @@ static int cpsw_legacy_probe_dt(struct cpsw_priv *priv)
 static int cpsw_switch_probe_dt(struct cpsw_priv *priv)
 {
 	struct device_d *dev = priv->dev;
-	struct device_node *np = dev->device_node, *child;
+	struct device_node *np = dev->of_node, *child;
 	struct device_node *ports = NULL;
 	int ret, i = 0;
 
@@ -1342,14 +1342,14 @@ static int cpsw_probe(struct device_d *dev)
 		return PTR_ERR(iores);
 	regs = IOMEM(iores->start);
 
-	ret = of_platform_populate(dev->device_node, NULL, dev);
+	ret = of_platform_populate(dev->of_node, NULL, dev);
 	if (ret)
 		return ret;
 
 	priv = xzalloc(sizeof(*priv));
 	priv->dev = dev;
 
-	if (dev->device_node) {
+	if (dev->of_node) {
 		ret = cpsw_probe_dt(priv);
 		if (ret)
 			goto out;
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index ff35b746e2..463c5fc11e 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -539,7 +539,7 @@ static int davinci_emac_probe(struct device_d *dev)
 	struct davinci_emac_priv *priv;
 	uint32_t ctrl_reg_offset;
 	uint32_t ctrl_ram_offset;
-	struct device_node *np = dev->device_node;
+	struct device_node *np = dev->of_node;
 
 	dev_dbg(dev, "+ emac_probe\n");
 
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index afc275e81e..c0683bfec4 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -427,12 +427,12 @@ static int dwc_probe_dt(struct device_d *dev, struct dw_eth_dev *priv)
 		return -ENODEV;
 
 	priv->phy_addr = -1;
-	priv->interface = of_get_phy_mode(dev->device_node);
+	priv->interface = of_get_phy_mode(dev->of_node);
 
 	/* Set MDIO bus device node, if present. */
-	for_each_child_of_node(dev->device_node, child) {
+	for_each_child_of_node(dev->of_node, child) {
 		if (of_device_is_compatible(child, "snps,dwmac-mdio")) {
-			priv->miibus.dev.device_node = child;
+			priv->miibus.dev.of_node = child;
 			break;
 		}
 	}
diff --git a/drivers/net/designware_eqos.c b/drivers/net/designware_eqos.c
index 7ff0b8489c..e998d35d5c 100644
--- a/drivers/net/designware_eqos.c
+++ b/drivers/net/designware_eqos.c
@@ -204,7 +204,7 @@ static int eqos_phy_reset(struct device_d *dev, struct eqos *eqos)
 	if (!gpio_is_valid(phy_reset))
 		return 0;
 
-	of_property_read_u32_array(dev->device_node,
+	of_property_read_u32_array(dev->of_node,
 				   "snps,reset-delays-us",
 				   delays, ARRAY_SIZE(delays));
 
@@ -808,14 +808,14 @@ static void eqos_probe_dt(struct device_d *dev, struct eqos *eqos)
 {
 	struct device_node *child;
 
-	eqos->interface = of_get_phy_mode(dev->device_node);
+	eqos->interface = of_get_phy_mode(dev->of_node);
 	eqos->phy_addr = -1;
 
 	/* Set MDIO bus device node, if present. */
-	for_each_child_of_node(dev->device_node, child) {
+	for_each_child_of_node(dev->of_node, child) {
 		if (of_device_is_compatible(child, "snps,dwmac-mdio") ||
 		    (child->name && !of_node_cmp(child->name, "mdio"))) {
-			eqos->miibus.dev.device_node = child;
+			eqos->miibus.dev.of_node = child;
 			break;
 		}
 	}
@@ -823,7 +823,7 @@ static void eqos_probe_dt(struct device_d *dev, struct eqos *eqos)
 
 int eqos_probe(struct device_d *dev, const struct eqos_ops *ops, void *priv)
 {
-	struct device_node *np = dev->device_node;
+	struct device_node *np = dev->of_node;
 	struct mii_bus *miibus;
 	struct resource *iores;
 	struct eqos *eqos;
@@ -863,9 +863,9 @@ int eqos_probe(struct device_d *dev, const struct eqos_ops *ops, void *priv)
 	miibus->write = eqos_mdio_write;
 	miibus->priv = eqos;
 
-	miibus->dev.device_node = of_get_compatible_child(np, "snps,dwmac-mdio");
-	if (!miibus->dev.device_node)
-		miibus->dev.device_node = of_get_child_by_name(np, "mdio");
+	miibus->dev.of_node = of_get_compatible_child(np, "snps,dwmac-mdio");
+	if (!miibus->dev.of_node)
+		miibus->dev.of_node = of_get_child_by_name(np, "mdio");
 
 	ret = eqos_init(dev, eqos);
 	if (ret)
diff --git a/drivers/net/designware_rockchip.c b/drivers/net/designware_rockchip.c
index a3859dce0c..fbb6be5fa1 100644
--- a/drivers/net/designware_rockchip.c
+++ b/drivers/net/designware_rockchip.c
@@ -232,7 +232,7 @@ static void eqos_rk_adjust_link(struct eth_device *edev)
 
 static int eqos_init_rk_gmac(struct device_d *dev, struct eqos *eqos)
 {
-	struct device_node *np = dev->device_node;
+	struct device_node *np = dev->of_node;
 	struct eqos_rk_gmac *priv = to_rk_gmac(eqos);
 	int i = 0, ret;
 	const char *strings;
diff --git a/drivers/net/designware_socfpga.c b/drivers/net/designware_socfpga.c
index d6c28af45e..0c2bc5797d 100644
--- a/drivers/net/designware_socfpga.c
+++ b/drivers/net/designware_socfpga.c
@@ -162,7 +162,7 @@ static int socfpga_dwc_probe_dt(struct device_d *dev, struct socfpga_dwc_dev *pr
 	if (!IS_ENABLED(CONFIG_OFTREE))
 		return -ENODEV;
 
-	ret = of_property_read_u32_index(dev->device_node, "altr,sysmgr-syscon",
+	ret = of_property_read_u32_index(dev->of_node, "altr,sysmgr-syscon",
 					 1, &reg_offset);
 	if (ret) {
 		dev_err(dev, "Could not read reg_offset from sysmgr-syscon! Please update the devicetree.\n");
@@ -170,14 +170,15 @@ static int socfpga_dwc_probe_dt(struct device_d *dev, struct socfpga_dwc_dev *pr
 		return -EINVAL;
 	}
 
-	ret = of_property_read_u32_index(dev->device_node, "altr,sysmgr-syscon",
+	ret = of_property_read_u32_index(dev->of_node, "altr,sysmgr-syscon",
 					 2, &reg_shift);
 	if (ret) {
 		dev_err(dev, "Could not read reg_shift from sysmgr-syscon! Please update the devicetree.\n");
 		return -EINVAL;
 	}
 
-	priv->f2h_ptp_ref_clk = of_property_read_bool(dev->device_node, "altr,f2h_ptp_ref_clk");
+	priv->f2h_ptp_ref_clk = of_property_read_bool(dev->of_node,
+						      "altr,f2h_ptp_ref_clk");
 
 	priv->reg_offset = reg_offset;
 	priv->reg_shift = reg_shift;
@@ -215,7 +216,7 @@ static int socfpga_dwc_ether_probe(struct device_d *dev)
 
 	dwc_dev->priv = priv;
 
-	dwc_dev->sys_mgr_base = syscon_base_lookup_by_phandle(dev->device_node,
+	dwc_dev->sys_mgr_base = syscon_base_lookup_by_phandle(dev->of_node,
 							      "altr,sysmgr-syscon");
 	if (IS_ERR(dwc_dev->sys_mgr_base)) {
 		dev_err(dev, "Could not get sysmgr-syscon node\n");
diff --git a/drivers/net/designware_starfive.c b/drivers/net/designware_starfive.c
index 3dc9d14e11..c6acb94644 100644
--- a/drivers/net/designware_starfive.c
+++ b/drivers/net/designware_starfive.c
@@ -67,7 +67,8 @@ static int starfive_dwc_ether_probe(struct device_d *dev)
 		{ .id = "tx" },
 	};
 
-	regmap = syscon_regmap_lookup_by_phandle(dev->device_node, "starfive,sysmain");
+	regmap = syscon_regmap_lookup_by_phandle(dev->of_node,
+						 "starfive,sysmain");
 	if (IS_ERR(regmap)) {
 		dev_err(dev, "Could not get starfive,sysmain node\n");
 		return PTR_ERR(regmap);
diff --git a/drivers/net/designware_stm32.c b/drivers/net/designware_stm32.c
index 43f2d0987c..a8e5bfbfad 100644
--- a/drivers/net/designware_stm32.c
+++ b/drivers/net/designware_stm32.c
@@ -114,7 +114,7 @@ static int eqos_set_mode_stm32(struct eqos_stm32 *priv, phy_interface_t interfac
 
 static int eqos_init_stm32(struct device_d *dev, struct eqos *eqos)
 {
-	struct device_node *np = dev->device_node;
+	struct device_node *np = dev->of_node;
 	struct eqos_stm32 *priv = to_stm32(eqos);
 	struct clk_bulk_data *eth_ck;
 	int ret;
@@ -126,14 +126,14 @@ static int eqos_init_stm32(struct device_d *dev, struct eqos *eqos)
 	priv->eth_ref_clk_sel_reg =
 		of_property_read_bool(np, "st,eth-ref-clk-sel");
 
-	priv->regmap = syscon_regmap_lookup_by_phandle(dev->device_node,
+	priv->regmap = syscon_regmap_lookup_by_phandle(dev->of_node,
 						       "st,syscon");
 	if (IS_ERR(priv->regmap)) {
 		dev_err(dev, "Could not get st,syscon node\n");
 		return PTR_ERR(priv->regmap);
 	}
 
-	ret = of_property_read_u32_index(dev->device_node, "st,syscon",
+	ret = of_property_read_u32_index(dev->of_node, "st,syscon",
 					 1, &priv->mode_reg);
 	if (ret) {
 		dev_err(dev, "Can't get sysconfig mode offset (%s)\n",
diff --git a/drivers/net/designware_tegra186.c b/drivers/net/designware_tegra186.c
index 0cbbdb46a4..78818a1ed6 100644
--- a/drivers/net/designware_tegra186.c
+++ b/drivers/net/designware_tegra186.c
@@ -217,7 +217,7 @@ static int eqos_init_tegra186(struct device_d *dev, struct eqos *eqos)
 		return PTR_ERR(priv->rst);
 	}
 
-	phy_reset = of_get_named_gpio(dev->device_node, "phy-reset-gpios", 0);
+	phy_reset = of_get_named_gpio(dev->of_node, "phy-reset-gpios", 0);
 	if (gpio_is_valid(phy_reset)) {
 		ret = gpio_request(phy_reset, "phy-reset");
 		if (ret)
diff --git a/drivers/net/dm9k.c b/drivers/net/dm9k.c
index d183ab55c9..a13e94e164 100644
--- a/drivers/net/dm9k.c
+++ b/drivers/net/dm9k.c
@@ -722,7 +722,7 @@ static int dm9k_init_dev(struct eth_device *edev)
 
 static int dm9000_parse_dt(struct device_d *dev, struct dm9k *priv)
 {
-	struct device_node *np = dev->device_node;
+	struct device_node *np = dev->of_node;
 	uint32_t prop;
 
 	if (!IS_ENABLED(CONFIG_OFDEVICE) || !np)
diff --git a/drivers/net/dsa.c b/drivers/net/dsa.c
index bc33892f39..1d34221dcb 100644
--- a/drivers/net/dsa.c
+++ b/drivers/net/dsa.c
@@ -59,7 +59,7 @@ static int dsa_port_probe(struct eth_device *edev)
 	int ret;
 
 	if (ops->port_probe) {
-		interface = of_get_phy_mode(dp->dev->device_node);
+		interface = of_get_phy_mode(dp->dev->of_node);
 		ret = ops->port_probe(dp, dp->index, interface);
 		if (ret)
 			return ret;
@@ -93,7 +93,7 @@ static int dsa_port_start(struct eth_device *edev)
 	if (dp->enabled)
 		return -EBUSY;
 
-	interface = of_get_phy_mode(dp->dev->device_node);
+	interface = of_get_phy_mode(dp->dev->of_node);
 
 	if (ops->port_pre_enable) {
 		/* In case of RMII interface we need to enable RMII clock
@@ -416,7 +416,7 @@ int dsa_register_switch(struct dsa_switch *ds)
 		return -ENODEV;
 	}
 
-	if (!ds->dev->device_node)
+	if (!ds->dev->of_node)
 		return -ENODEV;
 
 	if (!ds->num_ports || ds->num_ports > DSA_MAX_PORTS) {
@@ -424,7 +424,7 @@ int dsa_register_switch(struct dsa_switch *ds)
 		return -EINVAL;
 	}
 
-	ret = dsa_switch_parse_ports_of(ds, ds->dev->device_node);
+	ret = dsa_switch_parse_ports_of(ds, ds->dev->of_node);
 	if (ret)
 		return ret;
 
diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c
index 27143bd6d0..d7f5afe66d 100644
--- a/drivers/net/e1000/eeprom.c
+++ b/drivers/net/e1000/eeprom.c
@@ -410,8 +410,7 @@ static void e1000_eeprom_uses_microwire(struct e1000_eeprom_info *eeprom,
 
 static size_t e1000_igb_get_flash_size(struct e1000_hw *hw)
 {
-	struct device_node *node =
-		hw->pdev->dev.device_node;
+	struct device_node *node = hw->pdev->dev.of_node;
 	u32 flash_size;
 	uint32_t fla;
 	int ret = 0;
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index a2fc02d6f9..5e34357371 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -657,15 +657,15 @@ static int fec_probe_dt(struct device_d *dev, struct fec_priv *fec)
 	struct device_node *mdiobus;
 	int ret;
 
-	ret = of_get_phy_mode(dev->device_node);
+	ret = of_get_phy_mode(dev->of_node);
 	if (ret < 0)
 		fec->interface = PHY_INTERFACE_MODE_MII;
 	else
 		fec->interface = ret;
 
-	mdiobus = of_get_child_by_name(dev->device_node, "mdio");
+	mdiobus = of_get_child_by_name(dev->of_node, "mdio");
 	if (mdiobus)
-		fec->miibus.dev.device_node = mdiobus;
+		fec->miibus.dev.of_node = mdiobus;
 
 	return 0;
 }
@@ -825,10 +825,11 @@ static int fec_probe(struct device_d *dev)
 		goto release_res;
 	}
 
-	phy_reset = of_get_named_gpio(dev->device_node, "phy-reset-gpios", 0);
+	phy_reset = of_get_named_gpio(dev->of_node, "phy-reset-gpios", 0);
 	if (gpio_is_valid(phy_reset)) {
-		of_property_read_u32(dev->device_node, "phy-reset-duration", &msec);
-		of_property_read_u32(dev->device_node, "phy-reset-post-delay",
+		of_property_read_u32(dev->of_node, "phy-reset-duration",
+				     &msec);
+		of_property_read_u32(dev->of_node, "phy-reset-post-delay",
 				     &phy_post_delay);
 		/* valid reset duration should be less than 1s */
 		if (phy_post_delay > 1000)
@@ -873,7 +874,7 @@ static int fec_probe(struct device_d *dev)
 	if (ret < 0)
 		goto free_xbd;
 
-	if (dev->device_node) {
+	if (dev->of_node) {
 		ret = fec_probe_dt(dev, fec);
 		fec->phy_addr = -1;
 	} else if (pdata) {
diff --git a/drivers/net/fsl-fman.c b/drivers/net/fsl-fman.c
index 4d72933105..617fd11e25 100644
--- a/drivers/net/fsl-fman.c
+++ b/drivers/net/fsl-fman.c
@@ -1121,7 +1121,7 @@ static int fsl_fman_port_probe(struct device_d *dev)
 
 static int fsl_fman_memac_port_bind(struct fm_eth *fm_eth, enum fman_port_type type)
 {
-	struct device_node *macnp = fm_eth->dev->device_node;
+	struct device_node *macnp = fm_eth->dev->of_node;
 	struct device_node *portnp;
 	struct device_d *portdev;
 	struct fsl_fman_port *port;
@@ -1178,7 +1178,7 @@ static int fsl_fman_memac_probe(struct device_d *dev)
 	if (ret)
 		return ret;
 
-	phy_mode = of_get_phy_mode(dev->device_node);
+	phy_mode = of_get_phy_mode(dev->of_node);
 	if (phy_mode < 0)
 		return phy_mode;
 
@@ -1306,7 +1306,7 @@ static int fsl_fman_probe(struct device_d *dev)
 	reg = IOMEM(iores->start);
 	dev->priv = reg;
 
-	ret = of_platform_populate(dev->device_node, NULL, dev);
+	ret = of_platform_populate(dev->of_node, NULL, dev);
 	if (ret)
 		return ret;
 
diff --git a/drivers/net/liteeth.c b/drivers/net/liteeth.c
index 547f5486ae..c713d3412f 100644
--- a/drivers/net/liteeth.c
+++ b/drivers/net/liteeth.c
@@ -274,7 +274,7 @@ static int liteeth_set_ethaddr(struct eth_device *edev,
 
 static int liteeth_probe(struct device_d *dev)
 {
-	struct device_node *np = dev->device_node;
+	struct device_node *np = dev->of_node;
 	struct eth_device *edev;
 	void __iomem *buf_base;
 	struct liteeth *priv;
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 5dbca1553e..7ccc112c0c 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -815,19 +815,19 @@ static int macb_probe(struct device_d *dev)
 		macb->phy_flags = pdata->phy_flags;
 		pclk_name = "macb_clk";
 		hclk_name = NULL;
-	} else if (IS_ENABLED(CONFIG_OFDEVICE) && dev->device_node) {
+	} else if (IS_ENABLED(CONFIG_OFDEVICE) && dev->of_node) {
 		int ret;
 		struct device_node *mdiobus;
 
-		ret = of_get_phy_mode(dev->device_node);
+		ret = of_get_phy_mode(dev->of_node);
 		if (ret < 0)
 			macb->interface = PHY_INTERFACE_MODE_MII;
 		else
 			macb->interface = ret;
 
-		mdiobus = of_get_child_by_name(dev->device_node, "mdio");
+		mdiobus = of_get_child_by_name(dev->of_node, "mdio");
 		if (mdiobus)
-			macb->miibus.dev.device_node = mdiobus;
+			macb->miibus.dev.of_node = mdiobus;
 
 		macb->phy_addr = -1;
 		pclk_name = "pclk";
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 359c70c927..6dc0ceeafc 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -720,7 +720,7 @@ static int mvneta_probe(struct device_d *dev)
 		return PTR_ERR(priv->clk);
 	clk_enable(priv->clk);
 
-	ret = of_get_phy_mode(dev->device_node);
+	ret = of_get_phy_mode(dev->of_node);
 	if (ret < 0)
 		return ret;
 	priv->intf = ret;
diff --git a/drivers/net/orion-gbe.c b/drivers/net/orion-gbe.c
index 0ae94e6840..99fde13f3e 100644
--- a/drivers/net/orion-gbe.c
+++ b/drivers/net/orion-gbe.c
@@ -451,7 +451,7 @@ static int port_probe(struct device_d *parent, struct port_priv *port)
 	dev_set_name(dev, "%08x.ethernet-port", (u32)gbe->regs);
 	dev->id = port->portno;
 	dev->parent = parent;
-	dev->device_node = port->np;
+	dev->of_node = port->np;
 	ret = register_device(dev);
 	if (ret)
 		return ret;
@@ -499,13 +499,13 @@ static int orion_gbe_probe(struct device_d *dev)
 	 * Although untested, the driver should also be able to
 	 * deal with multi-port controllers.
 	 */
-	for_each_child_of_node(dev->device_node, pnp)
+	for_each_child_of_node(dev->of_node, pnp)
 		gbe->num_ports++;
 
 	gbe->ports = xzalloc(gbe->num_ports * sizeof(*gbe->ports));
 
 	ppriv = gbe->ports;
-	for_each_child_of_node(dev->device_node, pnp) {
+	for_each_child_of_node(dev->of_node, pnp) {
 		ppriv->np = pnp;
 
 		ret = port_probe(dev, ppriv);
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index 93a8bb9df1..2e62d03bf9 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -139,7 +139,7 @@ static bool at803x_match_phy_id(struct phy_device *phydev, u32 phy_id)
 static int at803x_parse_dt(struct phy_device *phydev)
 {
 	const struct device_d *dev = &phydev->dev;
-	const struct device_node *node = dev->device_node;
+	const struct device_node *node = dev->of_node;
 	struct at803x_priv *priv = phydev->priv;
 	unsigned int sel;
 	u32 freq, strength;
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index 2435df1b47..df6ab74de6 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -165,7 +165,7 @@ static int dp83867_of_init(struct phy_device *phydev)
 {
 	struct dp83867_private *dp83867 = phydev->priv;
 	struct device_d *dev = &phydev->dev;
-	struct device_node *of_node = dev->device_node;
+	struct device_node *of_node = dev->of_node;
 	int ret;
 
 	if (!of_node)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index d81632dfc7..c0b819b109 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -188,10 +188,10 @@ static int marvell_of_reg_init(struct phy_device *phydev)
 	const __be32 *paddr;
 	int len, i, saved_page, current_page, page_changed, ret;
 
-	if (!phydev->dev.device_node)
+	if (!phydev->dev.of_node)
 		return 0;
 
-	paddr = of_get_property(phydev->dev.device_node,
+	paddr = of_get_property(phydev->dev.of_node,
 				"marvell,reg-init", &len);
 	if (!paddr || len < (4 * sizeof(*paddr)))
 		return 0;
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c
index c64f2b3925..f161685715 100644
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
@@ -50,7 +50,7 @@ static struct mdio_gpio_info *mdio_gpio_of_get_info(struct device_d *dev)
 
 	info = xzalloc(sizeof(*info));
 
-	ret = of_get_gpio_flags(dev->device_node, 0, &flags);
+	ret = of_get_gpio_flags(dev->of_node, 0, &flags);
 	if (ret < 0) {
 		dev_dbg(dev, "failed to get MDC information from DT\n");
 		goto free_info;
@@ -59,7 +59,7 @@ static struct mdio_gpio_info *mdio_gpio_of_get_info(struct device_d *dev)
 	info->mdc = ret;
 	info->mdc_active_low = flags & OF_GPIO_ACTIVE_LOW;
 
-	ret = of_get_gpio_flags(dev->device_node, 1, &flags);
+	ret = of_get_gpio_flags(dev->of_node, 1, &flags);
 	if (ret < 0) {
 		dev_dbg(dev, "failed to get MDIO information from DT\n");
 		goto free_info;
@@ -68,7 +68,7 @@ static struct mdio_gpio_info *mdio_gpio_of_get_info(struct device_d *dev)
 	info->mdio = ret;
 	info->mdio_active_low = flags & OF_GPIO_ACTIVE_LOW;
 
-	ret = of_get_gpio_flags(dev->device_node, 2, &flags);
+	ret = of_get_gpio_flags(dev->of_node, 2, &flags);
 	if (ret > 0) {
 		dev_dbg(dev, "found MDO information in DT\n");
 		info->mdo = ret;
@@ -145,7 +145,7 @@ static struct mdiobb_ops mdio_gpio_ops = {
 static int mdio_gpio_probe(struct device_d *dev)
 {
 	int ret;
-	struct device_node *np = dev->device_node;
+	struct device_node *np = dev->of_node;
 	struct mdio_gpio_info *info;
 	struct mii_bus *bus;
 
@@ -202,7 +202,7 @@ static int mdio_gpio_probe(struct device_d *dev)
 
 	bus = alloc_mdio_bitbang(&info->ctrl);
 	bus->parent = dev;
-	bus->dev.device_node = np;
+	bus->dev.of_node = np;
 
 	dev->priv = bus;
 
diff --git a/drivers/net/phy/mdio-mux-gpio.c b/drivers/net/phy/mdio-mux-gpio.c
index a36782c0b6..7d93fb2aa0 100644
--- a/drivers/net/phy/mdio-mux-gpio.c
+++ b/drivers/net/phy/mdio-mux-gpio.c
@@ -74,7 +74,7 @@ static int mdio_mux_gpio_probe(struct device_d *dev)
 
 	s = xzalloc(sizeof(*s));
 
-	s->gpios_num = of_gpio_count(dev->device_node);
+	s->gpios_num = of_gpio_count(dev->of_node);
 	if (s->gpios_num <= 0) {
 		dev_err(dev, "No GPIOs specified\n");
 		r = -EINVAL;
@@ -86,7 +86,7 @@ static int mdio_mux_gpio_probe(struct device_d *dev)
 	for (i = 0; i < s->gpios_num; i++) {
 		enum of_gpio_flags flags;
 
-		r = of_get_gpio_flags(dev->device_node, i, &flags);
+		r = of_get_gpio_flags(dev->of_node, i, &flags);
 		if (!gpio_is_valid(r)) {
 			r = (r < 0) ? r : -EINVAL;
 			goto free_mem;
@@ -105,7 +105,7 @@ static int mdio_mux_gpio_probe(struct device_d *dev)
 		goto free_gpios;
 
 
-	r = mdio_mux_init(dev, dev->device_node,
+	r = mdio_mux_init(dev, dev->of_node,
 			  mdio_mux_gpio_switch_fn, s, NULL);
 	if (r < 0)
 		goto free_gpios;
diff --git a/drivers/net/phy/mdio-mux.c b/drivers/net/phy/mdio-mux.c
index 1e6278ef35..67d5664de9 100644
--- a/drivers/net/phy/mdio-mux.c
+++ b/drivers/net/phy/mdio-mux.c
@@ -117,7 +117,7 @@ int mdio_mux_init(struct device_d *dev,
 		cb->mii_bus.parent = dev;
 		cb->mii_bus.read   = mdio_mux_read;
 		cb->mii_bus.write  = mdio_mux_write;
-		cb->mii_bus.dev.device_node = child_bus_node;
+		cb->mii_bus.dev.of_node = child_bus_node;
 
 		r = mdiobus_register(&cb->mii_bus);
 		if (r) {
diff --git a/drivers/net/phy/mdio-mvebu.c b/drivers/net/phy/mdio-mvebu.c
index 289ff4b05d..0672481fea 100644
--- a/drivers/net/phy/mdio-mvebu.c
+++ b/drivers/net/phy/mdio-mvebu.c
@@ -119,7 +119,7 @@ static int mvebu_mdio_probe(struct device_d *dev)
 		return PTR_ERR(priv->clk);
 	clk_enable(priv->clk);
 
-	priv->miibus.dev.device_node = dev->device_node;
+	priv->miibus.dev.of_node = dev->of_node;
 	priv->miibus.priv = priv;
 	priv->miibus.parent = dev;
 	priv->miibus.read = mvebu_mdio_read;
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index a68b0e47c0..ee38143096 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -119,7 +119,7 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *chi
 	 * Associate the OF node with the device structure so it
 	 * can be looked up later
 	 */
-	phy->dev.device_node = child;
+	phy->dev.of_node = child;
 
 	/*
 	 * All data is now stored in the phy struct;
@@ -145,7 +145,7 @@ static int of_mdiobus_register_device(struct mii_bus *mdio,
 	if (IS_ERR(mdiodev))
 		return PTR_ERR(mdiodev);
 
-	mdiodev->dev.device_node = child;
+	mdiodev->dev.of_node = child;
 
 	ret = mdio_register_device(mdiodev);
 	if (ret)
@@ -314,16 +314,16 @@ int mdiobus_register(struct mii_bus *bus)
 
 	pr_info("%s: probed\n", dev_name(&bus->dev));
 
-	if (bus->dev.device_node) {
+	if (bus->dev.of_node) {
 		/* Register PHY's as child node to mdio node */
-		of_mdiobus_register(bus, bus->dev.device_node);
+		of_mdiobus_register(bus, bus->dev.of_node);
 	}
-	else if (bus->parent->device_node) {
+	else if (bus->parent->of_node) {
 		/*
 		 * Register PHY's as child node to the ethernet node,
 		 * if there was no mdio node
 		 */
-		of_mdiobus_register(bus, bus->parent->device_node);
+		of_mdiobus_register(bus, bus->parent->of_node);
 	}
 
 	return 0;
@@ -399,7 +399,7 @@ struct mii_bus *of_mdio_find_bus(struct device_node *mdio_bus_np)
 		return NULL;
 
 	for_each_mii_bus(mii)
-		if (mii->dev.device_node == mdio_bus_np)
+		if (mii->dev.of_node == mdio_bus_np)
 			return mii;
 
 	return NULL;
@@ -509,7 +509,7 @@ static struct cdev_operations phydev_ops = {
 
 static void of_set_phy_supported(struct phy_device *phydev)
 {
-	struct device_node *node = phydev->dev.device_node;
+	struct device_node *node = phydev->dev.of_node;
 	u32 max_speed;
 
 	if (!IS_ENABLED(CONFIG_OFDEVICE))
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 8a30faa92b..7b551969ab 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -129,7 +129,7 @@ static int kszphy_rmii_clk_sel(struct phy_device *phydev, bool val)
 static int kszphy_led_mode(struct phy_device *phydev, int reg, int shift)
 {
 	const struct device_d *dev = &phydev->dev;
-	const struct device_node *of_node = dev->device_node ? : dev->parent->device_node;
+	const struct device_node *of_node = dev->of_node ? : dev->parent->of_node;
 	u32 val;
 
 	if (!of_property_read_u32(of_node, "micrel,led-mode", &val)) {
@@ -279,7 +279,7 @@ static int ksz9021_load_values_from_of(struct phy_device *phydev,
 static int ksz9021_config_init(struct phy_device *phydev)
 {
 	const struct device_d *dev = &phydev->dev;
-	const struct device_node *of_node = dev->device_node;
+	const struct device_node *of_node = dev->of_node;
 	const char *clk_pad_skew_names[] = {
 		"txen-skew-ps", "txc-skew-ps",
 		"rxdv-skew-ps", "rxc-skew-ps"
@@ -293,8 +293,8 @@ static int ksz9021_config_init(struct phy_device *phydev)
 		"txd2-skew-ps", "txd3-skew-ps"
 	};
 
-	if (!of_node && dev->parent->device_node)
-		of_node = dev->parent->device_node;
+	if (!of_node && dev->parent->of_node)
+		of_node = dev->parent->of_node;
 
 	if (of_node) {
 		ksz9021_load_values_from_of(phydev, of_node,
@@ -472,7 +472,7 @@ static int ksz9031_config_rgmii_delay(struct phy_device *phydev)
 static int ksz9031_config_init(struct phy_device *phydev)
 {
 	const struct device_d *dev = &phydev->dev;
-	const struct device_node *of_node = dev->device_node;
+	const struct device_node *of_node = dev->of_node;
 	static const char *clk_skews[2] = {"rxc-skew-ps", "txc-skew-ps"};
 	static const char *rx_data_skews[4] = {
 		"rxd0-skew-ps", "rxd1-skew-ps",
@@ -485,8 +485,8 @@ static int ksz9031_config_init(struct phy_device *phydev)
 	static const char *control_skews[2] = {"txen-skew-ps", "rxdv-skew-ps"};
 	int ret;
 
-	if (!of_node && dev->parent->device_node)
-		of_node = dev->parent->device_node;
+	if (!of_node && dev->parent->of_node)
+		of_node = dev->parent->of_node;
 
 	if (of_node) {
 		if (phy_interface_is_rgmii(phydev)) {
@@ -612,7 +612,7 @@ static int ksz8873mll_config_init(struct phy_device *phydev)
 static int kszphy_probe(struct phy_device *phydev)
 {
 	struct device_d *dev = &phydev->dev;
-	struct device_node *np = dev->device_node;
+	struct device_node *np = dev->of_node;
 	struct phy_driver *drv = to_phy_driver(dev->driver);
 	const struct kszphy_type *type = drv->driver_data;
 	struct kszphy_priv *priv;
diff --git a/drivers/net/phy/mv88e6xxx/chip.c b/drivers/net/phy/mv88e6xxx/chip.c
index a7d707095b..07df19e99b 100644
--- a/drivers/net/phy/mv88e6xxx/chip.c
+++ b/drivers/net/phy/mv88e6xxx/chip.c
@@ -839,7 +839,7 @@ static const struct nvmem_bus mv88e6xxx_eeprom_nvmem_bus = {
 
 static int mv88e6xxx_probe(struct device_d *dev)
 {
-	struct device_node *np = dev->device_node;
+	struct device_node *np = dev->of_node;
 	struct device_node *mdio_node;
 	struct mv88e6xxx_chip *chip;
 	enum of_gpio_flags of_flags;
@@ -941,7 +941,7 @@ static int mv88e6xxx_probe(struct device_d *dev)
 
 	mdio_node = of_get_child_by_name(np, "mdio");
 	if (mdio_node)
-		chip->miibus.dev.device_node = mdio_node;
+		chip->miibus.dev.of_node = mdio_node;
 
 	err = mv88e6xxx_port_probe(chip);
 	if (err)
diff --git a/drivers/net/phy/mv88e6xxx/port.c b/drivers/net/phy/mv88e6xxx/port.c
index 93a789e658..5a00802361 100644
--- a/drivers/net/phy/mv88e6xxx/port.c
+++ b/drivers/net/phy/mv88e6xxx/port.c
@@ -565,7 +565,7 @@ device_phy_driver(mv88e6xxx_port_driver);
 int mv88e6xxx_port_probe(struct mv88e6xxx_chip *chip)
 {
 	struct device_d *dev = chip->dev;
-	struct device_node *np = dev->device_node;
+	struct device_node *np = dev->of_node;
 	struct device_node *port_node, *switch_node;
 	struct device_node *port_nodes[DSA_MAX_PORTS] = { NULL };
 	int err, i;
@@ -659,7 +659,7 @@ int mv88e6xxx_port_probe(struct mv88e6xxx_chip *chip)
  		phydev = phy_device_create(chip->parent_miibus,
 					   chip->info->port_base_addr + i,
 					   MV88E6XXX_SWITCH_PORT_PHY_ID);
-		phydev->dev.device_node = port_nodes[i];
+		phydev->dev.of_node = port_nodes[i];
 		phydev->dev.priv = chip;
 		phydev->duplex = DUPLEX_UNFORCED;
 
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 56ec8a28df..7377cb014d 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -338,16 +338,18 @@ static struct phy_device *of_mdio_find_phy(struct eth_device *edev)
 	if (!IS_ENABLED(CONFIG_OFDEVICE))
 		return NULL;
 
-	if (!edev->parent || !edev->parent->device_node)
+	if (!edev->parent || !edev->parent->of_node)
 		return NULL;
 
-	phy_node = of_parse_phandle(edev->parent->device_node, "phy-handle", 0);
+	phy_node = of_parse_phandle(edev->parent->of_node, "phy-handle", 0);
 	if (!phy_node)
-		phy_node = of_parse_phandle(edev->parent->device_node, "phy", 0);
+		phy_node = of_parse_phandle(edev->parent->of_node, "phy", 0);
 	if (!phy_node)
-		phy_node = of_parse_phandle(edev->parent->device_node, "phy-device", 0);
+		phy_node = of_parse_phandle(edev->parent->of_node,
+					    "phy-device", 0);
 	if (!phy_node) {
-		phy_node = of_get_child_by_name(edev->parent->device_node, "fixed-link");
+		phy_node = of_get_child_by_name(edev->parent->of_node,
+						"fixed-link");
 		if (phy_node)
 			return of_phy_register_fixed_link(phy_node, edev);
 	}
@@ -358,7 +360,7 @@ static struct phy_device *of_mdio_find_phy(struct eth_device *edev)
 	if (!of_property_read_u32(phy_node, "reg", &addr)) {
 		of_device_ensure_probed(phy_node->parent);
 		for_each_mii_bus(bus) {
-			if (bus->parent->device_node == phy_node->parent) {
+			if (bus->parent->of_node == phy_node->parent) {
 				struct phy_device *phy = mdiobus_scan(bus, addr);
 				if (!IS_ERR(phy))
 					return phy;
@@ -367,7 +369,7 @@ static struct phy_device *of_mdio_find_phy(struct eth_device *edev)
 	}
 
 	bus_for_each_device(&mdio_bus_type, dev) {
-		if (dev->device_node == phy_node)
+		if (dev->of_node == phy_node)
 			return container_of(dev, struct phy_device, dev);
 	}
 
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 7fd5c2aadb..c660b1d13f 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -505,18 +505,18 @@ static int smc911x_probe(struct device_d *dev)
 		priv->shift = pdata->shift;
 		priv->flags = pdata->flags;
 		priv->phy_mask = pdata->phy_mask;
-	} else if (IS_ENABLED(CONFIG_OFDEVICE) && dev->device_node) {
-		ret = of_property_read_u32(dev->device_node, "reg-io-width", &val);
+	} else if (IS_ENABLED(CONFIG_OFDEVICE) && dev->of_node) {
+		ret = of_property_read_u32(dev->of_node, "reg-io-width", &val);
 		if (ret)
 			return ret;
 		is_32bit = (val == 4);
 
-		of_property_read_u32(dev->device_node, "reg-shift", &priv->shift);
+		of_property_read_u32(dev->of_node, "reg-shift", &priv->shift);
 
-		if (of_property_read_bool(dev->device_node, "smsc,force-internal-phy"))
+		if (of_property_read_bool(dev->of_node, "smsc,force-internal-phy"))
 			priv->flags |= SMC911X_FORCE_INTERNAL_PHY;
 
-		if (of_property_read_bool(dev->device_node, "smsc,force-external-phy"))
+		if (of_property_read_bool(dev->of_node, "smsc,force-external-phy"))
 			priv->flags |= SMC911X_FORCE_EXTERNAL_PHY;
 	}