dm: treewide: Rename 'platdata' variables to just 'plat'

We use 'priv' for private data but often use 'platdata' for platform data.
We can't really use 'pdata' since that is ambiguous (it could mean private
or platform data).

Rename some of the latter variables to end with 'plat' for consistency.

Signed-off-by: Simon Glass <sjg@chromium.org>

62 files changed, 67 insertions, 67 deletions

diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index 02565aae7b..adcc20723f 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -1292,6 +1292,6 @@ U_BOOT_DRIVER(eth_ag7xxx) = {
 	.remove		= ag7xxx_eth_remove,
 	.ops		= &ag7xxx_eth_ops,
 	.priv_auto	= sizeof(struct ar7xxx_eth_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 7d0c58cd53..becc6a69e1 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -711,7 +711,7 @@ U_BOOT_DRIVER(altera_tse) = {
 	.of_match = altera_tse_ids,
 	.ops	= &altera_tse_ops,
 	.ofdata_to_platdata = altera_tse_ofdata_to_platdata,
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.priv_auto	= sizeof(struct altera_tse_priv),
 	.probe	= altera_tse_probe,
 };
diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c
index 6d62246678..7c79e9ad15 100644
--- a/drivers/net/bcm6348-eth.c
+++ b/drivers/net/bcm6348-eth.c
@@ -533,7 +533,7 @@ U_BOOT_DRIVER(bcm6348_eth) = {
 	.id = UCLASS_ETH,
 	.of_match = bcm6348_eth_ids,
 	.ops = &bcm6348_eth_ops,
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.priv_auto	= sizeof(struct bcm6348_eth_priv),
 	.probe = bcm6348_eth_probe,
 };
diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c
index b0bf0a939d..6e6548add6 100644
--- a/drivers/net/bcm6368-eth.c
+++ b/drivers/net/bcm6368-eth.c
@@ -637,7 +637,7 @@ U_BOOT_DRIVER(bcm6368_eth) = {
 	.id = UCLASS_ETH,
 	.of_match = bcm6368_eth_ids,
 	.ops = &bcm6368_eth_ops,
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.priv_auto	= sizeof(struct bcm6368_eth_priv),
 	.probe = bcm6368_eth_probe,
 };
diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index b6ebac220e..9fcb28a344 100644
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -733,6 +733,6 @@ U_BOOT_DRIVER(eth_bcmgenet) = {
 	.probe  = bcmgenet_eth_probe,
 	.ops    = &bcmgenet_gmac_eth_ops,
 	.priv_auto	= sizeof(struct bcmgenet_eth_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 26d2ec0970..66d1618773 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -752,7 +752,7 @@ U_BOOT_DRIVER(eth_dc2114x) = {
 	.probe	= dc2114x_probe,
 	.ops	= &dc2114x_ops,
 	.priv_auto	= sizeof(struct dc2114x_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
 
 U_BOOT_PCI_DEVICE(eth_dc2114x, supported);
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 32b3fc8230..83b31fa6bf 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -740,7 +740,7 @@ int designware_eth_probe(struct udevice *dev)
 #ifdef CONFIG_DM_PCI
 	/*
 	 * If we are on PCI bus, either directly attached to a PCI root port,
-	 * or via a PCI bridge, fill in platdata before we probe the hardware.
+	 * or via a PCI bridge, fill in plat before we probe the hardware.
 	 */
 	if (device_is_on_pci_bus(dev)) {
 		dm_pci_read_config32(dev, PCI_BASE_ADDRESS_0, &iobase);
@@ -874,7 +874,7 @@ U_BOOT_DRIVER(eth_designware) = {
 	.remove	= designware_eth_remove,
 	.ops	= &designware_eth_ops,
 	.priv_auto	= sizeof(struct dw_eth_dev),
-	.platdata_auto	= sizeof(struct dw_eth_pdata),
+	.plat_auto	= sizeof(struct dw_eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index de3ece81bc..018cbfd5cb 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -2194,5 +2194,5 @@ U_BOOT_DRIVER(eth_eqos) = {
 	.remove = eqos_remove,
 	.ops = &eqos_ops,
 	.priv_auto	= sizeof(struct eqos_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/dwmac_s700.c b/drivers/net/dwmac_s700.c
index 2edd7a74df..adb865d02b 100644
--- a/drivers/net/dwmac_s700.c
+++ b/drivers/net/dwmac_s700.c
@@ -62,6 +62,6 @@ U_BOOT_DRIVER(dwmac_s700) = {
 	.probe  = dwmac_s700_probe,
 	.ops    = &designware_eth_ops,
 	.priv_auto	= sizeof(struct dw_eth_dev),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c
index 9ab2eeb2bc..ebbbcacfa3 100644
--- a/drivers/net/dwmac_socfpga.c
+++ b/drivers/net/dwmac_socfpga.c
@@ -119,6 +119,6 @@ U_BOOT_DRIVER(dwmac_socfpga) = {
 	.probe		= dwmac_socfpga_probe,
 	.ops		= &designware_eth_ops,
 	.priv_auto	= sizeof(struct dw_eth_dev),
-	.platdata_auto	= sizeof(struct dwmac_socfpga_platdata),
+	.plat_auto	= sizeof(struct dwmac_socfpga_platdata),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 87acfa5daa..49e6be31d1 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -5941,7 +5941,7 @@ U_BOOT_DRIVER(eth_e1000) = {
 	.probe	= e1000_eth_probe,
 	.ops	= &e1000_eth_ops,
 	.priv_auto	= sizeof(struct e1000_hw),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
 
 U_BOOT_PCI_DEVICE(eth_e1000, e1000_supported);
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 59582b9121..f47caf1f31 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -1010,7 +1010,7 @@ U_BOOT_DRIVER(eth_eepro100) = {
 	.probe	= eepro100_probe,
 	.ops	= &eepro100_ops,
 	.priv_auto	= sizeof(struct eepro100_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
 
 U_BOOT_PCI_DEVICE(eth_eepro100, supported);
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index cb232f68bc..640db112e5 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -751,7 +751,7 @@ U_BOOT_DRIVER(ethoc) = {
 	.remove				= ethoc_remove,
 	.ops				= &ethoc_ops,
 	.priv_auto		= sizeof(struct ethoc),
-	.platdata_auto	= sizeof(struct ethoc_eth_pdata),
+	.plat_auto	= sizeof(struct ethoc_eth_pdata),
 };
 
 #else
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 9740bace99..e3d6c8e786 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -1598,6 +1598,6 @@ U_BOOT_DRIVER(fecmxc_gem) = {
 	.remove	= fecmxc_remove,
 	.ops	= &fecmxc_ops,
 	.priv_auto	= sizeof(struct fec_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
 #endif
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 3a827a97a8..f5fb513a15 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -1131,7 +1131,7 @@ U_BOOT_DRIVER(eth_fman) = {
 	.remove = fm_eth_remove,
 	.ops = &fm_eth_ops,
 	.priv_auto	= sizeof(struct fm_eth),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c
index 2e97f51c4c..8bd32b0ab7 100644
--- a/drivers/net/fm/memac_phy.c
+++ b/drivers/net/fm/memac_phy.c
@@ -298,7 +298,7 @@ U_BOOT_DRIVER(fman_mdio) = {
 	.remove = fm_mdio_remove,
 	.ops = &fm_mdio_ops,
 	.priv_auto	= sizeof(struct fm_mdio_priv),
-	.platdata_auto	= sizeof(struct mdio_perdev_priv),
+	.plat_auto	= sizeof(struct mdio_perdev_priv),
 };
 #endif /* CONFIG_PHYLIB && CONFIG_DM_MDIO */
 #endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c
index 07ad44de47..e988fb0205 100644
--- a/drivers/net/fsl_enetc.c
+++ b/drivers/net/fsl_enetc.c
@@ -69,7 +69,7 @@ void fdt_fixup_enetc_mac(void *blob)
 			continue;
 
 		pdata = dev_get_platdata(dev);
-		ppdata = dev_get_parent_platdata(dev);
+		ppdata = dev_get_parent_plat(dev);
 		devfn = PCI_FUNC(ppdata->devfn);
 
 		enetc_set_ierb_primary_mac(dev, devfn, pdata->enetaddr);
@@ -365,7 +365,7 @@ static int enetc_remove(struct udevice *dev)
 
 static int enetc_ls1028a_write_hwaddr(struct udevice *dev)
 {
-	struct pci_child_platdata *ppdata = dev_get_parent_platdata(dev);
+	struct pci_child_platdata *ppdata = dev_get_parent_plat(dev);
 	const int devfn_to_pf[] = {0, 1, 2, -1, -1, -1, 3};
 	struct eth_pdata *plat = dev_get_platdata(dev);
 	int devfn = PCI_FUNC(ppdata->devfn);
@@ -678,7 +678,7 @@ U_BOOT_DRIVER(eth_enetc) = {
 	.remove = enetc_remove,
 	.ops	= &enetc_ops,
 	.priv_auto	= sizeof(struct enetc_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
 
 static struct pci_device_id enetc_ids[] = {
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index 1023e1b1d9..6ab27e2d31 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -595,5 +595,5 @@ U_BOOT_DRIVER(mcffec) = {
 	.remove	= mcdmafec_remove,
 	.ops	= &mcdmafec_ops,
 	.priv_auto	= sizeof(struct fec_info_dma),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c
index faeb292e55..5fd11db05f 100644
--- a/drivers/net/fsl_mdio.c
+++ b/drivers/net/fsl_mdio.c
@@ -249,7 +249,7 @@ U_BOOT_DRIVER(tsec_mdio) = {
 	.remove = tsec_mdio_remove,
 	.ops = &tsec_mdio_ops,
 	.priv_auto	= sizeof(struct tsec_mdio_priv),
-	.platdata_auto	= sizeof(struct mdio_perdev_priv),
+	.plat_auto	= sizeof(struct mdio_perdev_priv),
 };
 #endif /* CONFIG_PHYLIB */
 #endif /* CONFIG_DM_MDIO */
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
index aec9ca06b7..dd696f3f22 100644
--- a/drivers/net/ftgmac100.c
+++ b/drivers/net/ftgmac100.c
@@ -614,6 +614,6 @@ U_BOOT_DRIVER(ftgmac100) = {
 	.remove = ftgmac100_remove,
 	.ops	= &ftgmac100_ops,
 	.priv_auto	= sizeof(struct ftgmac100_data),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 20b8e35516..de7ec4d1fc 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -441,7 +441,7 @@ U_BOOT_DRIVER(ftmac100) = {
 	.probe	= ftmac100_probe,
 	.ops	= &ftmac100_ops,
 	.priv_auto	= sizeof(struct ftmac100_data),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index 1b1e7a8f69..0bd1da58e4 100644
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -760,6 +760,6 @@ U_BOOT_DRIVER(eth_gmac_rockchip) = {
 	.probe	= gmac_rockchip_probe,
 	.ops	= &gmac_rockchip_eth_ops,
 	.priv_auto	= sizeof(struct dw_eth_dev),
-	.platdata_auto	= sizeof(struct gmac_rockchip_platdata),
+	.plat_auto	= sizeof(struct gmac_rockchip_platdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c
index 93c2523ac2..208b1678ce 100644
--- a/drivers/net/higmacv300.c
+++ b/drivers/net/higmacv300.c
@@ -599,5 +599,5 @@ U_BOOT_DRIVER(eth_higmac) = {
 	.remove	= higmac_remove,
 	.ops	= &higmac_ops,
 	.priv_auto	= sizeof(struct higmac_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index 6340d6317d..b0e6685175 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -699,7 +699,7 @@ U_BOOT_DRIVER(ks8851) = {
 	.probe		= ks8851_probe,
 	.ops		= &ks8851_ops,
 	.priv_auto	= sizeof(struct ks_net),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index 5932b45774..02935f642b 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -1192,7 +1192,7 @@ U_BOOT_DRIVER(ldpaa_eth) = {
 	.probe = ldpaa_eth_probe,
 	.ops = &ldpaa_eth_ops,
 	.priv_auto	= sizeof(struct ldpaa_eth_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
 
 #else
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 2ec3039cf8..4ad37fdc28 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -1336,7 +1336,7 @@ U_BOOT_DRIVER(eth_macb) = {
 	.remove	= macb_eth_remove,
 	.ops	= &macb_eth_ops,
 	.priv_auto	= sizeof(struct macb_device),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
 #endif
 
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index 7f7a865b82..d0c589352e 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -615,5 +615,5 @@ U_BOOT_DRIVER(mcffec) = {
 	.remove	= mcffec_remove,
 	.ops	= &mcffec_ops,
 	.priv_auto	= sizeof(struct fec_info_s),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c
index 779377b0db..f0ea6ea4d8 100644
--- a/drivers/net/mscc_eswitch/jr2_switch.c
+++ b/drivers/net/mscc_eswitch/jr2_switch.c
@@ -965,5 +965,5 @@ U_BOOT_DRIVER(jr2) = {
 	.remove				= jr2_remove,
 	.ops				= &jr2_ops,
 	.priv_auto		= sizeof(struct jr2_private),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c
index 8095f4fabd..1dfd86aa49 100644
--- a/drivers/net/mscc_eswitch/luton_switch.c
+++ b/drivers/net/mscc_eswitch/luton_switch.c
@@ -738,5 +738,5 @@ U_BOOT_DRIVER(luton) = {
 	.remove	  = luton_remove,
 	.ops	  = &luton_ops,
 	.priv_auto	= sizeof(struct luton_private),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c
index 5179b82a63..18e11ec2a9 100644
--- a/drivers/net/mscc_eswitch/ocelot_switch.c
+++ b/drivers/net/mscc_eswitch/ocelot_switch.c
@@ -652,5 +652,5 @@ U_BOOT_DRIVER(ocelot) = {
 	.remove	  = ocelot_remove,
 	.ops	  = &ocelot_ops,
 	.priv_auto	= sizeof(struct ocelot_private),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c
index e70f44cc10..e274ee5a06 100644
--- a/drivers/net/mscc_eswitch/serval_switch.c
+++ b/drivers/net/mscc_eswitch/serval_switch.c
@@ -605,5 +605,5 @@ U_BOOT_DRIVER(serval) = {
 	.remove				= serval_remove,
 	.ops				= &serval_ops,
 	.priv_auto		= sizeof(struct serval_private),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c
index 8855640938..59c0d85c4e 100644
--- a/drivers/net/mscc_eswitch/servalt_switch.c
+++ b/drivers/net/mscc_eswitch/servalt_switch.c
@@ -524,5 +524,5 @@ U_BOOT_DRIVER(servalt) = {
 	.remove				= servalt_remove,
 	.ops				= &servalt_ops,
 	.priv_auto		= sizeof(struct servalt_private),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c
index 60532111ab..c94d3dd4dc 100644
--- a/drivers/net/mt7628-eth.c
+++ b/drivers/net/mt7628-eth.c
@@ -652,5 +652,5 @@ U_BOOT_DRIVER(mt7628_eth) = {
 	.probe	= mt7628_eth_probe,
 	.ops	= &mt7628_eth_ops,
 	.priv_auto	= sizeof(struct mt7628_eth_dev),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index 05fdb44380..31e8547d16 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -1559,7 +1559,7 @@ U_BOOT_DRIVER(mtk_eth) = {
 	.id = UCLASS_ETH,
 	.of_match = mtk_eth_ids,
 	.ofdata_to_platdata = mtk_eth_ofdata_to_platdata,
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.probe = mtk_eth_probe,
 	.remove = mtk_eth_remove,
 	.ops = &mtk_eth_ops,
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 0be67152ca..0e4e88e42a 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -1042,6 +1042,6 @@ U_BOOT_DRIVER(mvgbe) = {
 	.probe	= mvgbe_probe,
 	.ops	= &mvgbe_ops,
 	.priv_auto	= sizeof(struct mvgbe_device),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
 #endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index a90a631757..4c478b9b95 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -1831,5 +1831,5 @@ U_BOOT_DRIVER(mvneta) = {
 	.probe	= mvneta_probe,
 	.ops	= &mvneta_ops,
 	.priv_auto	= sizeof(struct mvneta_port),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index c353aa677d..326f91caad 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -5425,7 +5425,7 @@ static struct driver mvpp2_driver = {
 	.remove = mvpp2_remove,
 	.ops	= &mvpp2_ops,
 	.priv_auto	= sizeof(struct mvpp2_port),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.flags	= DM_FLAG_ACTIVE_DMA,
 };
 
diff --git a/drivers/net/octeontx/nicvf_main.c b/drivers/net/octeontx/nicvf_main.c
index 8db46f84a6..3b5ba26c71 100644
--- a/drivers/net/octeontx/nicvf_main.c
+++ b/drivers/net/octeontx/nicvf_main.c
@@ -569,7 +569,7 @@ U_BOOT_DRIVER(octeontx_vnic) = {
 	.probe	= octeontx_vnic_probe,
 	.ops	= &octeontx_vnic_ops,
 	.priv_auto	= sizeof(struct nicvf),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
 
 static struct pci_device_id octeontx_vnic_supported[] = {
diff --git a/drivers/net/octeontx2/rvu_pf.c b/drivers/net/octeontx2/rvu_pf.c
index b000b91374..246fca26a4 100644
--- a/drivers/net/octeontx2/rvu_pf.c
+++ b/drivers/net/octeontx2/rvu_pf.c
@@ -105,7 +105,7 @@ U_BOOT_DRIVER(rvu_pf) = {
 	.remove = rvu_pf_remove,
 	.ops    = &nix_eth_ops,
 	.priv_auto	= sizeof(struct rvu_pf),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
 
 static struct pci_device_id rvu_pf_supported[] = {
diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c
index b413a4f249..3829ccc444 100644
--- a/drivers/net/pch_gbe.c
+++ b/drivers/net/pch_gbe.c
@@ -500,7 +500,7 @@ U_BOOT_DRIVER(eth_pch_gbe) = {
 	.remove = pch_gbe_remove,
 	.ops = &pch_gbe_ops,
 	.priv_auto	= sizeof(struct pch_gbe_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index 9b27033e79..ff9506f391 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -690,7 +690,7 @@ U_BOOT_DRIVER(eth_pcnet) = {
 	.probe	= pcnet_probe,
 	.ops	= &pcnet_ops,
 	.priv_auto	= sizeof(struct pcnet_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.flags	= DM_UC_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c
index c571324850..53a08dfcd2 100644
--- a/drivers/net/pfe_eth/pfe_eth.c
+++ b/drivers/net/pfe_eth/pfe_eth.c
@@ -291,5 +291,5 @@ U_BOOT_DRIVER(pfe_eth) = {
 	.remove = pfe_eth_remove,
 	.ops	= &pfe_eth_ops,
 	.priv_auto	= sizeof(struct pfe_eth_dev),
-	.platdata_auto	= sizeof(struct pfe_eth_pdata)
+	.plat_auto	= sizeof(struct pfe_eth_pdata)
 };
diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c
index ec491256ba..94c296e8f4 100644
--- a/drivers/net/pic32_eth.c
+++ b/drivers/net/pic32_eth.c
@@ -607,5 +607,5 @@ U_BOOT_DRIVER(pic32_ethernet) = {
 	.remove			= pic32_eth_remove,
 	.ops			= &pic32_eth_ops,
 	.priv_auto	= sizeof(struct pic32eth_dev),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/qe/dm_qe_uec.c b/drivers/net/qe/dm_qe_uec.c
index 00e01a41ab..b4052c78d7 100644
--- a/drivers/net/qe/dm_qe_uec.c
+++ b/drivers/net/qe/dm_qe_uec.c
@@ -1163,5 +1163,5 @@ U_BOOT_DRIVER(eth_qe_uec) = {
 	.remove = qe_uec_remove,
 	.ops	= &qe_uec_eth_ops,
 	.priv_auto	= sizeof(struct qe_uec_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index d1a45ceedc..48530c4499 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -690,6 +690,6 @@ U_BOOT_DRIVER(eth_ravb) = {
 	.remove		= ravb_remove,
 	.ops		= &ravb_ops,
 	.priv_auto	= sizeof(struct ravb_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index 934e0c25d4..c171e54e8c 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -772,7 +772,7 @@ U_BOOT_DRIVER(eth_rtl8139) = {
 	.probe	= rtl8139_probe,
 	.ops	= &rtl8139_ops,
 	.priv_auto	= sizeof(struct rtl8139_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
 
 U_BOOT_PCI_DEVICE(eth_rtl8139, supported);
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 7512f640c2..dc3405e4c4 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -1187,7 +1187,7 @@ int rtl8169_initialize(struct bd_info *bis)
 #ifdef CONFIG_DM_ETH
 static int rtl8169_eth_probe(struct udevice *dev)
 {
-	struct pci_child_platdata *pplat = dev_get_parent_platdata(dev);
+	struct pci_child_platdata *pplat = dev_get_parent_plat(dev);
 	struct rtl8169_private *priv = dev_get_priv(dev);
 	struct eth_pdata *plat = dev_get_platdata(dev);
 	u32 iobase;
@@ -1249,7 +1249,7 @@ U_BOOT_DRIVER(eth_rtl8169) = {
 	.probe	= rtl8169_eth_probe,
 	.ops	= &rtl8169_eth_ops,
 	.priv_auto	= sizeof(struct rtl8169_private),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
 
 U_BOOT_PCI_DEVICE(eth_rtl8169, supported);
diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c
index 32f63416b9..76a424ec94 100644
--- a/drivers/net/sandbox-raw.c
+++ b/drivers/net/sandbox-raw.c
@@ -194,5 +194,5 @@ U_BOOT_DRIVER(eth_sandbox_raw) = {
 	.ofdata_to_platdata = sb_eth_raw_ofdata_to_platdata,
 	.ops	= &sb_eth_raw_ops,
 	.priv_auto	= sizeof(struct eth_sandbox_raw_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index 4d007ae022..846b802cfa 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -447,5 +447,5 @@ U_BOOT_DRIVER(eth_sandbox) = {
 	.remove	= sb_eth_remove,
 	.ops	= &sb_eth_ops,
 	.priv_auto	= sizeof(struct eth_sandbox_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index a5bd4596fd..b1b8731f16 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -958,7 +958,7 @@ U_BOOT_DRIVER(eth_sh_ether) = {
 	.remove		= sh_ether_remove,
 	.ops		= &sh_ether_ops,
 	.priv_auto	= sizeof(struct sh_ether_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index e0083ce8a3..648932d8bc 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -640,7 +640,7 @@ U_BOOT_DRIVER(smc911x) = {
 	.probe		= smc911x_probe,
 	.ops		= &smc911x_ops,
 	.priv_auto	= sizeof(struct smc911x_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index 301462009b..60153c0141 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -999,5 +999,5 @@ U_BOOT_DRIVER(ave) = {
 	.ofdata_to_platdata = ave_ofdata_to_platdata,
 	.ops	  = &ave_ops,
 	.priv_auto	= sizeof(struct ave_private),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index 0fa8ba97b0..3430b229a8 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -1005,6 +1005,6 @@ U_BOOT_DRIVER(eth_sun8i_emac) = {
 	.probe  = sun8i_emac_eth_probe,
 	.ops    = &sun8i_emac_eth_ops,
 	.priv_auto	= sizeof(struct emac_eth_dev),
-	.platdata_auto	= sizeof(struct sun8i_eth_pdata),
+	.plat_auto	= sizeof(struct sun8i_eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c
index dfdf3c1f7d..0770a6bfc7 100644
--- a/drivers/net/sunxi_emac.c
+++ b/drivers/net/sunxi_emac.c
@@ -613,5 +613,5 @@ U_BOOT_DRIVER(eth_sunxi_emac) = {
 	.probe	= sunxi_emac_eth_probe,
 	.ops	= &sunxi_emac_eth_ops,
 	.priv_auto	= sizeof(struct emac_eth_dev),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c
index c8dcefe5e3..ce891fc58e 100644
--- a/drivers/net/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ti/am65-cpsw-nuss.c
@@ -792,6 +792,6 @@ U_BOOT_DRIVER(am65_cpsw_nuss_slave) = {
 	.probe	= am65_cpsw_probe_cpsw,
 	.ops	= &am65_cpsw_ops,
 	.priv_auto	= sizeof(struct am65_cpsw_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index 94c10a8234..62348919b6 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -1378,7 +1378,7 @@ U_BOOT_DRIVER(eth_cpsw) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.of_match = cpsw_eth_ids,
 	.ofdata_to_platdata = cpsw_eth_ofdata_to_platdata,
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 #endif
 	.probe	= cpsw_eth_probe,
 	.ops	= &cpsw_eth_ops,
diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index 2f025018aa..9cf7e6cc64 100644
--- a/drivers/net/ti/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
@@ -865,5 +865,5 @@ U_BOOT_DRIVER(davinci_emac) = {
 	.of_match	= davinci_emac_ids,
 	.probe		= davinci_emac_probe,
 	.ops		= &davinci_emac_ops,
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 62658bc212..b67981e74f 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -805,7 +805,7 @@ U_BOOT_DRIVER(eth_ks2_slave) = {
 	.remove	= ks2_eth_remove,
 	.ops	= &ks2_eth_ops,
 	.priv_auto	= sizeof(struct ks2_eth_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 
@@ -818,6 +818,6 @@ U_BOOT_DRIVER(eth_ks2) = {
 	.remove	= ks2_eth_remove,
 	.ops	= &ks2_eth_ops,
 	.priv_auto	= sizeof(struct ks2_eth_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 228820484a..8c53059ae2 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -905,7 +905,7 @@ U_BOOT_DRIVER(eth_tsec) = {
 	.remove = tsec_remove,
 	.ops = &tsec_ops,
 	.priv_auto	= sizeof(struct tsec_private),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index 194985b157..5604a337e0 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -792,5 +792,5 @@ U_BOOT_DRIVER(axi_emac) = {
 	.remove	= axi_emac_remove,
 	.ops	= &axi_emac_ops,
 	.priv_auto	= sizeof(struct axidma_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 03cd4cc9d9..acbf0fa3d2 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -636,5 +636,5 @@ U_BOOT_DRIVER(emaclite) = {
 	.remove = emaclite_remove,
 	.ops    = &emaclite_ops,
 	.priv_auto	= sizeof(struct xemaclite),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 2df4bc2fc5..ea57be2a40 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -812,5 +812,5 @@ U_BOOT_DRIVER(zynq_gem) = {
 	.remove	= zynq_gem_remove,
 	.ops	= &zynq_gem_ops,
 	.priv_auto	= sizeof(struct zynq_gem_priv),
-	.platdata_auto	= sizeof(struct eth_pdata),
+	.plat_auto	= sizeof(struct eth_pdata),
 };