diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c
index 17d2dd660dc..3e9c1f3b33c 100644
--- a/arch/arm/mach-stm32mp/bsec.c
+++ b/arch/arm/mach-stm32mp/bsec.c
@@ -473,7 +473,7 @@ static const struct misc_ops stm32mp_bsec_ops = {
 	.write = stm32mp_bsec_write,
 };
 
-static int stm32mp_bsec_ofdata_to_platdata(struct udevice *dev)
+static int stm32mp_bsec_of_to_plat(struct udevice *dev)
 {
 	struct stm32mp_bsec_platdata *plat = dev_get_plat(dev);
 
@@ -512,7 +512,7 @@ U_BOOT_DRIVER(stm32mp_bsec) = {
 	.name = "stm32mp_bsec",
 	.id = UCLASS_MISC,
 	.of_match = stm32mp_bsec_ids,
-	.ofdata_to_platdata = stm32mp_bsec_ofdata_to_platdata,
+	.of_to_plat = stm32mp_bsec_of_to_plat,
 	.plat_auto	= sizeof(struct stm32mp_bsec_platdata),
 	.ops = &stm32mp_bsec_ops,
 	.probe = stm32mp_bsec_probe,
diff --git a/arch/arm/mach-stm32mp/pwr_regulator.c b/arch/arm/mach-stm32mp/pwr_regulator.c
index 4f468715515..74a5df59487 100644
--- a/arch/arm/mach-stm32mp/pwr_regulator.c
+++ b/arch/arm/mach-stm32mp/pwr_regulator.c
@@ -59,7 +59,7 @@ static int stm32mp_pwr_read(struct udevice *dev, uint reg, uint8_t *buff,
 	return 0;
 }
 
-static int stm32mp_pwr_ofdata_to_platdata(struct udevice *dev)
+static int stm32mp_pwr_of_to_plat(struct udevice *dev)
 {
 	struct stm32mp_pwr_priv *priv = dev_get_priv(dev);
 
@@ -103,7 +103,7 @@ U_BOOT_DRIVER(stm32mp_pwr_pmic) = {
 	.of_match = stm32mp_pwr_ids,
 	.bind = stm32mp_pwr_bind,
 	.ops = &stm32mp_pwr_ops,
-	.ofdata_to_platdata = stm32mp_pwr_ofdata_to_platdata,
+	.of_to_plat = stm32mp_pwr_of_to_plat,
 	.priv_auto	= sizeof(struct stm32mp_pwr_priv),
 };
 
diff --git a/arch/x86/cpu/acpi_gpe.c b/arch/x86/cpu/acpi_gpe.c
index 6ff80e5d312..83128c33c2c 100644
--- a/arch/x86/cpu/acpi_gpe.c
+++ b/arch/x86/cpu/acpi_gpe.c
@@ -51,7 +51,7 @@ static int acpi_gpe_read_and_clear(struct irq *irq)
 	return ret;
 }
 
-static int acpi_gpe_ofdata_to_platdata(struct udevice *dev)
+static int acpi_gpe_of_to_plat(struct udevice *dev)
 {
 	struct acpi_gpe_priv *priv = dev_get_priv(dev);
 
@@ -107,6 +107,6 @@ U_BOOT_DRIVER(acpi_gpe_drv) = {
 	.id		= UCLASS_IRQ,
 	.of_match	= acpi_gpe_ids,
 	.ops		= &acpi_gpe_ops,
-	.ofdata_to_platdata	= acpi_gpe_ofdata_to_platdata,
+	.of_to_plat	= acpi_gpe_of_to_plat,
 	.priv_auto	= sizeof(struct acpi_gpe_priv),
 };
diff --git a/arch/x86/cpu/apollolake/hostbridge.c b/arch/x86/cpu/apollolake/hostbridge.c
index a8ae6e48291..16f90a484d0 100644
--- a/arch/x86/cpu/apollolake/hostbridge.c
+++ b/arch/x86/cpu/apollolake/hostbridge.c
@@ -221,7 +221,7 @@ static int apl_hostbridge_early_init(struct udevice *dev)
 	return 0;
 }
 
-static int apl_hostbridge_ofdata_to_platdata(struct udevice *dev)
+static int apl_hostbridge_of_to_plat(struct udevice *dev)
 {
 	struct apl_hostbridge_platdata *plat = dev_get_plat(dev);
 	struct udevice *pinctrl;
@@ -400,7 +400,7 @@ U_BOOT_DRIVER(intel_apl_hostbridge) = {
 	.name		= "intel_apl_hostbridge",
 	.id		= UCLASS_NORTHBRIDGE,
 	.of_match	= apl_hostbridge_ids,
-	.ofdata_to_platdata = apl_hostbridge_ofdata_to_platdata,
+	.of_to_plat = apl_hostbridge_of_to_plat,
 	.probe		= apl_hostbridge_probe,
 	.remove		= apl_hostbridge_remove,
 	.plat_auto	= sizeof(struct apl_hostbridge_platdata),
diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c
index f186c504b3f..931f3399cbf 100644
--- a/arch/x86/cpu/apollolake/pmc.c
+++ b/arch/x86/cpu/apollolake/pmc.c
@@ -221,7 +221,7 @@ U_BOOT_DRIVER(intel_apl_pmc) = {
 	.name		= "intel_apl_pmc",
 	.id		= UCLASS_ACPI_PMC,
 	.of_match	= apl_pmc_ids,
-	.ofdata_to_platdata = apl_pmc_ofdata_to_uc_platdata,
+	.of_to_plat = apl_pmc_ofdata_to_uc_platdata,
 	.probe		= apl_pmc_probe,
 	.ops		= &apl_pmc_ops,
 	.plat_auto	= sizeof(struct apl_pmc_platdata),
diff --git a/arch/x86/cpu/apollolake/uart.c b/arch/x86/cpu/apollolake/uart.c
index bb6da0311f9..b70299b1dd4 100644
--- a/arch/x86/cpu/apollolake/uart.c
+++ b/arch/x86/cpu/apollolake/uart.c
@@ -72,7 +72,7 @@ void apl_uart_init(pci_dev_t bdf, ulong base)
  *
  * When running with of-platdata (generally TPL), the platdata is converted to
  * something that ns16550 expects. When running withoutof-platdata (SPL, U-Boot
- * proper), we use ns16550's ofdata_to_platdata routine.
+ * proper), we use ns16550's of_to_plat routine.
  */
 
 static int apl_ns16550_probe(struct udevice *dev)
@@ -85,7 +85,7 @@ static int apl_ns16550_probe(struct udevice *dev)
 	return ns16550_serial_probe(dev);
 }
 
-static int apl_ns16550_ofdata_to_platdata(struct udevice *dev)
+static int apl_ns16550_of_to_plat(struct udevice *dev)
 {
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct dtd_intel_apl_ns16550 *dtplat = dev_get_plat(dev);
@@ -109,7 +109,7 @@ static int apl_ns16550_ofdata_to_platdata(struct udevice *dev)
 #else
 	int ret;
 
-	ret = ns16550_serial_ofdata_to_platdata(dev);
+	ret = ns16550_serial_of_to_plat(dev);
 	if (ret)
 		return ret;
 #endif /* OF_PLATDATA */
@@ -129,6 +129,6 @@ U_BOOT_DRIVER(intel_apl_ns16550) = {
 	.plat_auto	= sizeof(struct ns16550_platdata),
 	.priv_auto	= sizeof(struct NS16550),
 	.ops	= &ns16550_serial_ops,
-	.ofdata_to_platdata = apl_ns16550_ofdata_to_platdata,
+	.of_to_plat = apl_ns16550_of_to_plat,
 	.probe = apl_ns16550_probe,
 };
diff --git a/arch/x86/cpu/broadwell/adsp.c b/arch/x86/cpu/broadwell/adsp.c
index 41f7d5d4d1a..1fa18237809 100644
--- a/arch/x86/cpu/broadwell/adsp.c
+++ b/arch/x86/cpu/broadwell/adsp.c
@@ -122,7 +122,7 @@ static int broadwell_adsp_probe(struct udevice *dev)
 	return 0;
 }
 
-static int broadwell_adsp_ofdata_to_platdata(struct udevice *dev)
+static int broadwell_adsp_of_to_plat(struct udevice *dev)
 {
 	struct broadwell_adsp_priv *priv = dev_get_priv(dev);
 
@@ -142,7 +142,7 @@ static const struct udevice_id broadwell_adsp_ids[] = {
 U_BOOT_DRIVER(broadwell_adsp_drv) = {
 	.name		= "adsp",
 	.id		= UCLASS_SYSCON,
-	.ofdata_to_platdata	= broadwell_adsp_ofdata_to_platdata,
+	.of_to_plat	= broadwell_adsp_of_to_plat,
 	.of_match	= broadwell_adsp_ids,
 	.bind           = dm_scan_fdt_dev,
 	.probe		= broadwell_adsp_probe,
diff --git a/arch/x86/cpu/broadwell/sata.c b/arch/x86/cpu/broadwell/sata.c
index 829751ee8a7..c33116a0ff0 100644
--- a/arch/x86/cpu/broadwell/sata.c
+++ b/arch/x86/cpu/broadwell/sata.c
@@ -232,7 +232,7 @@ static int broadwell_sata_enable(struct udevice *dev)
 	return 0;
 }
 
-static int broadwell_sata_ofdata_to_platdata(struct udevice *dev)
+static int broadwell_sata_of_to_plat(struct udevice *dev)
 {
 	struct sata_platdata *plat = dev_get_plat(dev);
 	const void *blob = gd->fdt_blob;
@@ -264,7 +264,7 @@ U_BOOT_DRIVER(ahci_broadwell_drv) = {
 	.name		= "ahci_broadwell",
 	.id		= UCLASS_AHCI,
 	.of_match	= broadwell_ahci_ids,
-	.ofdata_to_platdata	= broadwell_sata_ofdata_to_platdata,
+	.of_to_plat	= broadwell_sata_of_to_plat,
 	.probe		= broadwell_sata_probe,
 	.plat_auto	 = sizeof(struct sata_platdata),
 };
diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c
index 9f354ed2b5a..b9ea968a96d 100644
--- a/arch/x86/cpu/intel_common/itss.c
+++ b/arch/x86/cpu/intel_common/itss.c
@@ -178,7 +178,7 @@ static int itss_bind(struct udevice *dev)
 	return 0;
 }
 
-static int itss_ofdata_to_platdata(struct udevice *dev)
+static int itss_of_to_plat(struct udevice *dev)
 {
 	struct itss_priv *priv = dev_get_priv(dev);
 	int ret;
@@ -241,7 +241,7 @@ U_BOOT_DRIVER(intel_itss) = {
 	.of_match	= itss_ids,
 	.ops		= &itss_ops,
 	.bind		= itss_bind,
-	.ofdata_to_platdata = itss_ofdata_to_platdata,
+	.of_to_plat = itss_of_to_plat,
 	.plat_auto	= sizeof(struct itss_platdata),
 	.priv_auto	= sizeof(struct itss_priv),
 };
diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c
index 804835aa025..39e47090a3a 100644
--- a/arch/x86/cpu/intel_common/p2sb.c
+++ b/arch/x86/cpu/intel_common/p2sb.c
@@ -90,7 +90,7 @@ static int p2sb_spl_init(struct udevice *dev)
 	return 0;
 }
 
-int p2sb_ofdata_to_platdata(struct udevice *dev)
+int p2sb_of_to_plat(struct udevice *dev)
 {
 	struct p2sb_uc_priv *upriv = dev_get_uclass_priv(dev);
 	struct p2sb_platdata *plat = dev_get_plat(dev);
@@ -196,7 +196,7 @@ U_BOOT_DRIVER(intel_p2sb) = {
 	.probe		= p2sb_probe,
 	.remove		= p2sb_remove,
 	.ops		= &p2sb_ops,
-	.ofdata_to_platdata = p2sb_ofdata_to_platdata,
+	.of_to_plat = p2sb_of_to_plat,
 	.plat_auto	= sizeof(struct p2sb_platdata),
 	.per_child_plat_auto	=
 		sizeof(struct p2sb_child_platdata),
diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c
index 34d09ee9c42..a285e4d202d 100644
--- a/arch/x86/cpu/slimbootloader/serial.c
+++ b/arch/x86/cpu/slimbootloader/serial.c
@@ -14,7 +14,7 @@
  * The serial port info hob is generated by Slim Bootloader, so eligible for
  * Slim Bootloader based boards only.
  */
-static int slimbootloader_serial_ofdata_to_platdata(struct udevice *dev)
+static int slimbootloader_serial_of_to_plat(struct udevice *dev)
 {
 	const efi_guid_t guid = SBL_SERIAL_PORT_INFO_GUID;
 	struct sbl_serial_port_info *data;
@@ -57,7 +57,7 @@ U_BOOT_DRIVER(serial_slimbootloader) = {
 	.name	= "serial_slimbootloader",
 	.id	= UCLASS_SERIAL,
 	.of_match = slimbootloader_serial_ids,
-	.ofdata_to_platdata = slimbootloader_serial_ofdata_to_platdata,
+	.of_to_plat = slimbootloader_serial_of_to_plat,
 	.plat_auto	= sizeof(struct ns16550_platdata),
 	.priv_auto	= sizeof(struct NS16550),
 	.probe	= ns16550_serial_probe,
diff --git a/arch/x86/include/asm/intel_pinctrl.h b/arch/x86/include/asm/intel_pinctrl.h
index fc59a42463e..44eedc205c3 100644
--- a/arch/x86/include/asm/intel_pinctrl.h
+++ b/arch/x86/include/asm/intel_pinctrl.h
@@ -162,16 +162,15 @@ extern const struct pinctrl_ops intel_pinctrl_ops;
 int intel_pinctrl_probe(struct udevice *dev);
 
 /**
- * intel_pinctrl_ofdata_to_platdata() - Handle common plat setup
+ * intel_pinctrl_of_to_plat() - Handle common plat setup
  *
  * @dev: Pinctrl device
  * @comm: Pad community for this device
  * @num_cfgs: Number of configuration words for each pad
  * @return 0 if OK, -EDOM if @comm is NULL, other -ve value on other error
  */
-int intel_pinctrl_ofdata_to_platdata(struct udevice *dev,
-				     const struct pad_community *comm,
-				     int num_cfgs);
+int intel_pinctrl_of_to_plat(struct udevice *dev,
+			     const struct pad_community *comm, int num_cfgs);
 
 /**
  * pinctrl_route_gpe() - set GPIO groups for the general-purpose-event blocks
diff --git a/board/intel/galileo/galileo.c b/board/intel/galileo/galileo.c
index 720350d0f7f..341b627a65f 100644
--- a/board/intel/galileo/galileo.c
+++ b/board/intel/galileo/galileo.c
@@ -12,7 +12,7 @@
  * Intel Galileo gen2 board uses GPIO Resume Well bank pin0 as the PERST# pin.
  *
  * We cannot use any public GPIO APIs in <asm-generic/gpio.h> to control this
- * pin, as these APIs will eventually call into gpio_ich6_ofdata_to_platdata()
+ * pin, as these APIs will eventually call into gpio_ich6_of_to_plat()
  * in the Intel ICH6 GPIO driver where it calls PCI configuration space access
  * APIs which will trigger PCI enumeration process.
  *
diff --git a/doc/driver-model/debugging.rst b/doc/driver-model/debugging.rst
index c59bf6763bd..bbb2794340f 100644
--- a/doc/driver-model/debugging.rst
+++ b/doc/driver-model/debugging.rst
@@ -46,7 +46,7 @@ to see errors. Common ones are:
      going.
    - -EINVAL which typically indicates that something was missing or wrong in
      the device tree node. Check that everything is correct and look at the
-     ofdata_to_platdata() method in the driver.
+     of_to_plat() method in the driver.
 
 If there is no error, you should check if the device is actually bound. Call
 dm_dump_all() just before you locate the device to make sure it exists.
diff --git a/doc/driver-model/design.rst b/doc/driver-model/design.rst
index 98fa20a08c3..13c4b44aeac 100644
--- a/doc/driver-model/design.rst
+++ b/doc/driver-model/design.rst
@@ -333,11 +333,11 @@ Briefly, they are:
 
    * bind - make the driver model aware of a device (bind it to its driver)
    * unbind - make the driver model forget the device
-   * ofdata_to_platdata - convert device tree data to plat - see later
+   * of_to_plat - convert device tree data to plat - see later
    * probe - make a device ready for use
    * remove - remove a device so it cannot be used until probed again
 
-The sequence to get a device to work is bind, ofdata_to_platdata (if using
+The sequence to get a device to work is bind, of_to_plat (if using
 device tree) and probe.
 
 
@@ -449,23 +449,23 @@ The easiest way to make this work it to add a few members to the driver:
 .. code-block:: c
 
 	.plat_auto = sizeof(struct dm_test_pdata),
-	.ofdata_to_platdata = testfdt_ofdata_to_platdata,
+	.of_to_plat = testfdt_of_to_plat,
 
 The 'auto' feature allowed space for the plat to be allocated
-and zeroed before the driver's ofdata_to_platdata() method is called. The
-ofdata_to_platdata() method, which the driver write supplies, should parse
+and zeroed before the driver's of_to_plat() method is called. The
+of_to_plat() method, which the driver write supplies, should parse
 the device tree node for this device and place it in dev->plat. Thus
 when the probe method is called later (to set up the device ready for use)
 the platform data will be present.
 
-Note that both methods are optional. If you provide an ofdata_to_platdata
+Note that both methods are optional. If you provide an of_to_plat
 method then it will be called first (during activation). If you provide a
 probe method it will be called next. See Driver Lifecycle below for more
 details.
 
 If you don't want to have the plat automatically allocated then you
 can leave out plat_auto. In this case you can use malloc
-in your ofdata_to_platdata (or probe) method to allocate the required memory,
+in your of_to_plat (or probe) method to allocate the required memory,
 and you should free it in the remove method.
 
 The driver model tree is intended to mirror that of the device tree. The
@@ -709,7 +709,7 @@ Most devices have data in the device tree which they can read to find out the
 base address of hardware registers and parameters relating to driver
 operation. This is called 'ofdata' (Open-Firmware data).
 
-The device's_ofdata_to_platdata() implemnents allocation and reading of
+The device's of_to_plat() implemnents allocation and reading of
 plat. A parent's ofdata is always read before a child.
 
 The steps are:
@@ -738,7 +738,7 @@ The steps are:
    space. The controller can hold information about the USB state of each
    of its children.
 
-   5. If the driver provides an ofdata_to_platdata() method, then this is
+   5. If the driver provides an of_to_plat() method, then this is
    called to convert the device tree data into platform data. This should
    do various calls like dev_read_u32(dev, ...) to access the node and store
    the resulting information into dev->plat. After this point, the device
@@ -747,9 +747,9 @@ The steps are:
    in the plat structure. Typically you will use the
    plat_auto feature to specify the size of the platform data
    structure, and U-Boot will automatically allocate and zero it for you before
-   entry to ofdata_to_platdata(). But if not, you can allocate it yourself in
-   ofdata_to_platdata(). Note that it is preferable to do all the device tree
-   decoding in ofdata_to_platdata() rather than in probe(). (Apart from the
+   entry to of_to_plat(). But if not, you can allocate it yourself in
+   of_to_plat(). Note that it is preferable to do all the device tree
+   decoding in of_to_plat() rather than in probe(). (Apart from the
    ugliness of mixing configuration and run-time data, one day it is possible
    that U-Boot will cache platform data for devices which are regularly
    de/activated).
@@ -763,7 +763,7 @@ the device up.
 
 Having probing separate from ofdata-reading helps deal with of-platdata, where
 the probe() method is common to both DT/of-platdata operation, but the
-ofdata_to_platdata() method is implemented differently.
+of_to_plat() method is implemented differently.
 
 Another case has come up where this separate is useful. Generation of ACPI
 tables uses the of-platdata but does not want to probe the device. Probing
@@ -774,18 +774,18 @@ even be possible to probe the device - e.g. an SD card which is not
 present will cause an error on probe, yet we still must tell Linux about
 the SD card connector in case it is used while Linux is running.
 
-It is important that the ofdata_to_platdata() method does not actually probe
+It is important that the of_to_plat() method does not actually probe
 the device itself. However there are cases where other devices must be probed
-in the ofdata_to_platdata() method. An example is where a device requires a
+in the of_to_plat() method. An example is where a device requires a
 GPIO for it to operate. To select a GPIO obviously requires that the GPIO
 device is probed. This is OK when used by common, core devices such as GPIO,
 clock, interrupts, reset and the like.
 
 If your device relies on its parent setting up a suitable address space, so
 that dev_read_addr() works correctly, then make sure that the parent device
-has its setup code in ofdata_to_platdata(). If it has it in the probe method,
+has its setup code in of_to_plat(). If it has it in the probe method,
 then you cannot call dev_read_addr() from the child device's
-ofdata_to_platdata() method. Move it to probe() instead. Buses like PCI can
+of_to_plat() method. Move it to probe() instead. Buses like PCI can
 fall afoul of this rule.
 
 Activation/probe
@@ -862,7 +862,7 @@ remove it. This performs the probe steps in reverse:
         happens automatically within the driver model core; or
 
       - when plat_auto is 0, both the allocation (in probe()
-        or preferably ofdata_to_platdata()) and the deallocation in remove()
+        or preferably of_to_plat()) and the deallocation in remove()
         are the responsibility of the driver author.
 
    5. The device is marked inactive. Note that it is still bound, so the
diff --git a/doc/driver-model/ethernet.rst b/doc/driver-model/ethernet.rst
index 2444c5cbd45..cdbccca34d6 100644
--- a/doc/driver-model/ethernet.rst
+++ b/doc/driver-model/ethernet.rst
@@ -25,7 +25,7 @@ the UCLASS_ETH .id field in the U-Boot driver struct:
 		.name			= "eth_ape",
 		.id			= UCLASS_ETH,
 		.of_match		= eth_ape_ids,
-		.ofdata_to_platdata	= eth_ape_ofdata_to_platdata,
+		.of_to_plat	= eth_ape_of_to_plat,
 		.probe			= eth_ape_probe,
 		.ops			= &eth_ape_ops,
 		.priv_auto	= sizeof(struct eth_ape_priv),
diff --git a/doc/driver-model/of-plat.rst b/doc/driver-model/of-plat.rst
index b9976ac72d4..4436c4a2721 100644
--- a/doc/driver-model/of-plat.rst
+++ b/doc/driver-model/of-plat.rst
@@ -174,7 +174,7 @@ accessed using:
     struct dtd_rockchip_rk3288_dw_mshc *plat = dev_get_plat(dev);
 
 This avoids the code overhead of converting the device tree data to
-platform data in the driver. The ofdata_to_platdata() method should
+platform data in the driver. The of_to_plat() method should
 therefore do nothing in such a driver.
 
 Note that for the platform data to be matched with a driver, the 'name'
@@ -222,7 +222,7 @@ all the limitations metioned in caveats above.
 
 Therefore it is recommended that the of-platdata structure should be used
 only in the probe() method of your driver. It cannot be used in the
-ofdata_to_platdata() method since this is not called when platform data is
+of_to_plat() method since this is not called when platform data is
 already present.
 
 
@@ -234,7 +234,7 @@ feature is intended as a add-on to existing drivers.
 
 Your driver should convert the plat struct in its probe() method. The
 existing device tree decoding logic should be kept in the
-ofdata_to_platdata() method and wrapped with #if.
+of_to_plat() method and wrapped with #if.
 
 For example:
 
@@ -254,7 +254,7 @@ For example:
             int fifo_depth;
     };
 
-    static int mmc_ofdata_to_platdata(struct udevice *dev)
+    static int mmc_of_to_plat(struct udevice *dev)
     {
     #if !CONFIG_IS_ENABLED(OF_PLATDATA)
             /* Decode the device tree data */
@@ -291,7 +291,7 @@ For example:
             .name           = "mmc_drv",
             .id             = UCLASS_MMC,
             .of_match       = mmc_ids,
-            .ofdata_to_platdata = mmc_ofdata_to_platdata,
+            .of_to_plat = mmc_of_to_plat,
             .probe          = mmc_probe,
             .priv_auto = sizeof(struct mmc_priv),
             .plat_auto = sizeof(struct mmc_platdata),
@@ -313,7 +313,7 @@ speaking it is a non-zero plat_size which triggers this).
 The of-platdata struct contents is copied from the C structure data to the
 start of the newly allocated area. In the case where device tree is used,
 the platform data is allocated, and starts zeroed. In this case the
-ofdata_to_platdata() method should still set up the platform data (and the
+of_to_plat() method should still set up the platform data (and the
 of-platdata struct will not be present).
 
 SPL must use either of-platdata or device tree. Drivers cannot use both at
diff --git a/doc/driver-model/spi-howto.rst b/doc/driver-model/spi-howto.rst
index b3b719f572c..0770a09f0b7 100644
--- a/doc/driver-model/spi-howto.rst
+++ b/doc/driver-model/spi-howto.rst
@@ -69,7 +69,7 @@ Put this code at the bottom of your existing driver file:
 		return NULL;
 	}
 
-	static int exynos_spi_ofdata_to_platdata(struct udevice *dev)
+	static int exynos_spi_of_to_plat(struct udevice *dev)
 	{
 		return -ENODEV;
 	}
@@ -138,7 +138,7 @@ Put this code at the bottom of your existing driver file:
 		.id	= UCLASS_SPI,
 		.of_match = exynos_spi_ids,
 		.ops	= &exynos_spi_ops,
-		.ofdata_to_platdata = exynos_spi_ofdata_to_platdata,
+		.of_to_plat = exynos_spi_of_to_plat,
 		.probe	= exynos_spi_probe,
 		.remove	= exynos_spi_remove,
 	};
@@ -217,7 +217,7 @@ DM tells you. The name is not quite right. So in this case we would use:
 	};
 
 
-Write ofdata_to_platdata() [for device tree only]
+Write of_to_plat() [for device tree only]
 -------------------------------------------------
 
 This method will convert information in the device tree node into a C
@@ -239,7 +239,7 @@ fills in the fields from device tree.
 
 .. code-block:: c
 
-	static int exynos_spi_ofdata_to_platdata(struct udevice *bus)
+	static int exynos_spi_of_to_plat(struct udevice *bus)
 	{
 		struct exynos_spi_platdata *plat = bus->plat;
 		const void *blob = gd->fdt_blob;
diff --git a/doc/driver-model/usb-info.rst b/doc/driver-model/usb-info.rst
index ec8f3170a90..e9fe9d2904c 100644
--- a/doc/driver-model/usb-info.rst
+++ b/doc/driver-model/usb-info.rst
@@ -39,7 +39,7 @@ as drivers in the USB uclass. For example:
 		.name	= "ehci_tegra",
 		.id	= UCLASS_USB,
 		.of_match = ehci_usb_ids,
-		.ofdata_to_platdata = ehci_usb_ofdata_to_platdata,
+		.of_to_plat = ehci_usb_of_to_plat,
 		.probe = tegra_ehci_usb_probe,
 		.remove = tegra_ehci_usb_remove,
 		.ops	= &ehci_usb_ops,
@@ -51,7 +51,7 @@ as drivers in the USB uclass. For example:
 Here ehci_usb_ids is used to list the controllers that the driver supports.
 Each has its own data value. Controllers must be in the UCLASS_USB uclass.
 
-The ofdata_to_platdata() method allows the controller driver to grab any
+The of_to_plat() method allows the controller driver to grab any
 necessary settings from the device tree.
 
 The ops here are ehci_usb_ops. All EHCI drivers will use these same ops in
diff --git a/drivers/adc/exynos-adc.c b/drivers/adc/exynos-adc.c
index 6ae46aed155..65898170858 100644
--- a/drivers/adc/exynos-adc.c
+++ b/drivers/adc/exynos-adc.c
@@ -101,7 +101,7 @@ int exynos_adc_probe(struct udevice *dev)
 	return 0;
 }
 
-int exynos_adc_ofdata_to_platdata(struct udevice *dev)
+int exynos_adc_of_to_plat(struct udevice *dev)
 {
 	struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);
 	struct exynos_adc_priv *priv = dev_get_priv(dev);
@@ -139,6 +139,6 @@ U_BOOT_DRIVER(exynos_adc) = {
 	.of_match	= exynos_adc_ids,
 	.ops		= &exynos_adc_ops,
 	.probe		= exynos_adc_probe,
-	.ofdata_to_platdata = exynos_adc_ofdata_to_platdata,
+	.of_to_plat = exynos_adc_of_to_plat,
 	.priv_auto	= sizeof(struct exynos_adc_priv),
 };
diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c
index ac75742657b..13a8f49dc50 100644
--- a/drivers/adc/meson-saradc.c
+++ b/drivers/adc/meson-saradc.c
@@ -675,7 +675,7 @@ static int meson_saradc_probe(struct udevice *dev)
 	return 0;
 }
 
-int meson_saradc_ofdata_to_platdata(struct udevice *dev)
+int meson_saradc_of_to_plat(struct udevice *dev)
 {
 	struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);
 	struct meson_saradc_priv *priv = dev_get_priv(dev);
@@ -720,6 +720,6 @@ U_BOOT_DRIVER(meson_saradc) = {
 	.of_match	= meson_saradc_ids,
 	.ops		= &meson_saradc_ops,
 	.probe		= meson_saradc_probe,
-	.ofdata_to_platdata = meson_saradc_ofdata_to_platdata,
+	.of_to_plat = meson_saradc_of_to_plat,
 	.priv_auto	= sizeof(struct meson_saradc_priv),
 };
diff --git a/drivers/adc/rockchip-saradc.c b/drivers/adc/rockchip-saradc.c
index 4af7416a41f..e464d33f226 100644
--- a/drivers/adc/rockchip-saradc.c
+++ b/drivers/adc/rockchip-saradc.c
@@ -117,7 +117,7 @@ int rockchip_saradc_probe(struct udevice *dev)
 	return 0;
 }
 
-int rockchip_saradc_ofdata_to_platdata(struct udevice *dev)
+int rockchip_saradc_of_to_plat(struct udevice *dev)
 {
 	struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);
 	struct rockchip_saradc_priv *priv = dev_get_priv(dev);
@@ -179,6 +179,6 @@ U_BOOT_DRIVER(rockchip_saradc) = {
 	.of_match	= rockchip_saradc_ids,
 	.ops		= &rockchip_saradc_ops,
 	.probe		= rockchip_saradc_probe,
-	.ofdata_to_platdata = rockchip_saradc_ofdata_to_platdata,
+	.of_to_plat = rockchip_saradc_of_to_plat,
 	.priv_auto	= sizeof(struct rockchip_saradc_priv),
 };
diff --git a/drivers/adc/sandbox.c b/drivers/adc/sandbox.c
index 905ce4fc51f..6e435462ab8 100644
--- a/drivers/adc/sandbox.c
+++ b/drivers/adc/sandbox.c
@@ -135,7 +135,7 @@ int sandbox_adc_probe(struct udevice *dev)
 	return 0;
 }
 
-int sandbox_adc_ofdata_to_platdata(struct udevice *dev)
+int sandbox_adc_of_to_plat(struct udevice *dev)
 {
 	struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);
 
@@ -168,6 +168,6 @@ U_BOOT_DRIVER(sandbox_adc) = {
 	.of_match	= sandbox_adc_ids,
 	.ops		= &sandbox_adc_ops,
 	.probe		= sandbox_adc_probe,
-	.ofdata_to_platdata = sandbox_adc_ofdata_to_platdata,
+	.of_to_plat = sandbox_adc_of_to_plat,
 	.priv_auto	= sizeof(struct sandbox_adc_priv),
 };
diff --git a/drivers/ata/dwc_ahci.c b/drivers/ata/dwc_ahci.c
index a865bcbcf9e..826fea71cc5 100644
--- a/drivers/ata/dwc_ahci.c
+++ b/drivers/ata/dwc_ahci.c
@@ -29,7 +29,7 @@ static int dwc_ahci_bind(struct udevice *dev)
 	return ahci_bind_scsi(dev, &scsi_dev);
 }
 
-static int dwc_ahci_ofdata_to_platdata(struct udevice *dev)
+static int dwc_ahci_of_to_plat(struct udevice *dev)
 {
 	struct dwc_ahci_priv *priv = dev_get_priv(dev);
 	fdt_addr_t addr;
@@ -92,7 +92,7 @@ U_BOOT_DRIVER(dwc_ahci) = {
 	.id	= UCLASS_AHCI,
 	.of_match = dwc_ahci_ids,
 	.bind	= dwc_ahci_bind,
-	.ofdata_to_platdata = dwc_ahci_ofdata_to_platdata,
+	.of_to_plat = dwc_ahci_of_to_plat,
 	.ops	= &scsi_ops,
 	.probe	= dwc_ahci_probe,
 	.priv_auto	= sizeof(struct dwc_ahci_priv),
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index 9c4171117f2..e44db0a3745 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -903,7 +903,7 @@ U_BOOT_DRIVER(sata_fsl_driver) = {
 	.plat_auto	= sizeof(struct fsl_ata_priv),
 };
 
-static int fsl_ata_ofdata_to_platdata(struct udevice *dev)
+static int fsl_ata_of_to_plat(struct udevice *dev)
 {
 	struct fsl_ata_priv *priv = dev_get_priv(dev);
 
@@ -1026,7 +1026,7 @@ U_BOOT_DRIVER(fsl_ahci) = {
 	.id = UCLASS_AHCI,
 	.of_match = fsl_ata_ids,
 	.ops = &sata_fsl_ahci_ops,
-	.ofdata_to_platdata = fsl_ata_ofdata_to_platdata,
+	.of_to_plat = fsl_ata_of_to_plat,
 	.probe	= fsl_ata_probe,
 	.remove = fsl_ata_remove,
 	.priv_auto	= sizeof(struct fsl_ata_priv),
diff --git a/drivers/ata/mtk_ahci.c b/drivers/ata/mtk_ahci.c
index ac7fa493b2f..cd28e0cae37 100644
--- a/drivers/ata/mtk_ahci.c
+++ b/drivers/ata/mtk_ahci.c
@@ -40,7 +40,7 @@ static int mtk_ahci_bind(struct udevice *dev)
 	return ahci_bind_scsi(dev, &scsi_dev);
 }
 
-static int mtk_ahci_ofdata_to_platdata(struct udevice *dev)
+static int mtk_ahci_of_to_plat(struct udevice *dev)
 {
 	struct mtk_ahci_priv *priv = dev_get_priv(dev);
 
@@ -121,7 +121,7 @@ U_BOOT_DRIVER(mtk_ahci) = {
 	.id	= UCLASS_AHCI,
 	.of_match = mtk_ahci_ids,
 	.bind	= mtk_ahci_bind,
-	.ofdata_to_platdata = mtk_ahci_ofdata_to_platdata,
+	.of_to_plat = mtk_ahci_of_to_plat,
 	.ops	= &scsi_ops,
 	.probe	= mtk_ahci_probe,
 	.priv_auto	= sizeof(struct mtk_ahci_priv),
diff --git a/drivers/ata/sata_ceva.c b/drivers/ata/sata_ceva.c
index 9a77725ae61..87e6a90f74e 100644
--- a/drivers/ata/sata_ceva.c
+++ b/drivers/ata/sata_ceva.c
@@ -199,7 +199,7 @@ static const struct udevice_id sata_ceva_ids[] = {
 	{ }
 };
 
-static int sata_ceva_ofdata_to_platdata(struct udevice *dev)
+static int sata_ceva_of_to_plat(struct udevice *dev)
 {
 	struct ceva_sata_priv *priv = dev_get_priv(dev);
 	struct resource res_regs;
@@ -235,5 +235,5 @@ U_BOOT_DRIVER(ceva_host_blk) = {
 	.ops = &scsi_ops,
 	.priv_auto	= sizeof(struct ceva_sata_priv),
 	.probe = sata_ceva_probe,
-	.ofdata_to_platdata = sata_ceva_ofdata_to_platdata,
+	.of_to_plat = sata_ceva_of_to_plat,
 };
diff --git a/drivers/cache/cache-v5l2.c b/drivers/cache/cache-v5l2.c
index 5b9ced98e2f..cb9ebbb4f9c 100644
--- a/drivers/cache/cache-v5l2.c
+++ b/drivers/cache/cache-v5l2.c
@@ -104,7 +104,7 @@ static int v5l2_disable(struct udevice *dev)
 	return 0;
 }
 
-static int v5l2_ofdata_to_platdata(struct udevice *dev)
+static int v5l2_of_to_plat(struct udevice *dev)
 {
 	struct v5l2_plat *plat = dev_get_plat(dev);
 	struct l2cache *regs;
@@ -180,7 +180,7 @@ U_BOOT_DRIVER(v5l2_cache) = {
 	.name   = "v5l2_cache",
 	.id     = UCLASS_CACHE,
 	.of_match = v5l2_cache_ids,
-	.ofdata_to_platdata = v5l2_ofdata_to_platdata,
+	.of_to_plat = v5l2_of_to_plat,
 	.probe	= v5l2_probe,
 	.plat_auto	= sizeof(struct v5l2_plat),
 	.ops = &v5l2_cache_ops,
diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c
index c67155c03f5..e0f43a264c5 100644
--- a/drivers/clk/altera/clk-agilex.c
+++ b/drivers/clk/altera/clk-agilex.c
@@ -628,7 +628,7 @@ static int socfpga_clk_probe(struct udevice *dev)
 	return 0;
 }
 
-static int socfpga_clk_ofdata_to_platdata(struct udevice *dev)
+static int socfpga_clk_of_to_plat(struct udevice *dev)
 {
 	struct socfpga_clk_platdata *plat = dev_get_plat(dev);
 	fdt_addr_t addr;
@@ -657,6 +657,6 @@ U_BOOT_DRIVER(socfpga_agilex_clk) = {
 	.of_match	= socfpga_clk_match,
 	.ops		= &socfpga_clk_ops,
 	.probe		= socfpga_clk_probe,
-	.ofdata_to_platdata = socfpga_clk_ofdata_to_platdata,
+	.of_to_plat = socfpga_clk_of_to_plat,
 	.plat_auto	= sizeof(struct socfpga_clk_platdata),
 };
diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c
index 11f10c51028..e1e4876025d 100644
--- a/drivers/clk/altera/clk-arria10.c
+++ b/drivers/clk/altera/clk-arria10.c
@@ -319,7 +319,7 @@ static int socfpga_a10_clk_probe(struct udevice *dev)
 	return 0;
 }
 
-static int socfpga_a10_ofdata_to_platdata(struct udevice *dev)
+static int socfpga_a10_of_to_plat(struct udevice *dev)
 {
 	struct socfpga_a10_clk_platdata *plat = dev_get_plat(dev);
 	unsigned int divreg[3], gatereg[2];
@@ -357,7 +357,7 @@ U_BOOT_DRIVER(socfpga_a10_clk) = {
 	.ops		= &socfpga_a10_clk_ops,
 	.bind		= socfpga_a10_clk_bind,
 	.probe		= socfpga_a10_clk_probe,
-	.ofdata_to_platdata = socfpga_a10_ofdata_to_platdata,
+	.of_to_plat = socfpga_a10_of_to_plat,
 
 	.plat_auto	= sizeof(struct socfpga_a10_clk_platdata),
 };
diff --git a/drivers/clk/aspeed/clk_ast2500.c b/drivers/clk/aspeed/clk_ast2500.c
index e2e8d49b655..a0906716250 100644
--- a/drivers/clk/aspeed/clk_ast2500.c
+++ b/drivers/clk/aspeed/clk_ast2500.c
@@ -491,7 +491,7 @@ struct clk_ops ast2500_clk_ops = {
 	.enable = ast2500_clk_enable,
 };
 
-static int ast2500_clk_ofdata_to_platdata(struct udevice *dev)
+static int ast2500_clk_of_to_plat(struct udevice *dev)
 {
 	struct ast2500_clk_priv *priv = dev_get_priv(dev);
 
@@ -526,5 +526,5 @@ U_BOOT_DRIVER(aspeed_ast2500_scu) = {
 	.priv_auto	= sizeof(struct ast2500_clk_priv),
 	.ops		= &ast2500_clk_ops,
 	.bind		= ast2500_clk_bind,
-	.ofdata_to_platdata		= ast2500_clk_ofdata_to_platdata,
+	.of_to_plat		= ast2500_clk_of_to_plat,
 };
diff --git a/drivers/clk/at91/compat.c b/drivers/clk/at91/compat.c
index 71375249585..89283e6e36c 100644
--- a/drivers/clk/at91/compat.c
+++ b/drivers/clk/at91/compat.c
@@ -638,7 +638,7 @@ static struct clk_ops utmi_clk_ops = {
 	.get_rate = utmi_clk_get_rate,
 };
 
-static int utmi_clk_ofdata_to_platdata(struct udevice *dev)
+static int utmi_clk_of_to_plat(struct udevice *dev)
 {
 	struct pmc_platdata *plat = dev_get_plat(dev);
 	struct udevice *syscon;
@@ -667,7 +667,7 @@ U_BOOT_DRIVER(at91sam9x5_utmi_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = utmi_clk_match,
 	.probe = utmi_clk_probe,
-	.ofdata_to_platdata = utmi_clk_ofdata_to_platdata,
+	.of_to_plat = utmi_clk_of_to_plat,
 	.plat_auto	= sizeof(struct pmc_platdata),
 	.ops = &utmi_clk_ops,
 };
@@ -853,7 +853,7 @@ static struct clk_ops generic_clk_ops = {
 	.set_rate = generic_clk_set_rate,
 };
 
-static int generic_clk_ofdata_to_platdata(struct udevice *dev)
+static int generic_clk_of_to_plat(struct udevice *dev)
 {
 	struct generic_clk_priv *priv = dev_get_priv(dev);
 	u32 cells[GENERATED_SOURCE_MAX];
@@ -875,7 +875,7 @@ U_BOOT_DRIVER(generic_clk) = {
 	.name = "generic-clk",
 	.id = UCLASS_CLK,
 	.probe = at91_clk_probe,
-	.ofdata_to_platdata = generic_clk_ofdata_to_platdata,
+	.of_to_plat = generic_clk_of_to_plat,
 	.priv_auto	= sizeof(struct generic_clk_priv),
 	.plat_auto	= sizeof(struct pmc_platdata),
 	.ops = &generic_clk_ops,
@@ -977,7 +977,7 @@ static struct clk_ops at91_usb_clk_ops = {
 	.set_rate = at91_usb_clk_set_rate,
 };
 
-static int at91_usb_clk_ofdata_to_platdata(struct udevice *dev)
+static int at91_usb_clk_of_to_plat(struct udevice *dev)
 {
 	struct at91_usb_clk_priv *priv = dev_get_priv(dev);
 	u32 cells[AT91_USB_CLK_SOURCE_MAX];
@@ -1011,7 +1011,7 @@ U_BOOT_DRIVER(at91_usb_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = at91_usb_clk_match,
 	.probe = at91_usb_clk_probe,
-	.ofdata_to_platdata = at91_usb_clk_ofdata_to_platdata,
+	.of_to_plat = at91_usb_clk_of_to_plat,
 	.priv_auto	= sizeof(struct at91_usb_clk_priv),
 	.plat_auto	= sizeof(struct pmc_platdata),
 	.ops = &at91_usb_clk_ops,
diff --git a/drivers/clk/clk_boston.c b/drivers/clk/clk_boston.c
index 374fc9ac76b..2e81777b703 100644
--- a/drivers/clk/clk_boston.c
+++ b/drivers/clk/clk_boston.c
@@ -58,7 +58,7 @@ const struct clk_ops clk_boston_ops = {
 	.get_rate = clk_boston_get_rate,
 };
 
-static int clk_boston_ofdata_to_platdata(struct udevice *dev)
+static int clk_boston_of_to_plat(struct udevice *dev)
 {
 	struct clk_boston *state = dev_get_plat(dev);
 	struct udevice *syscon;
@@ -91,7 +91,7 @@ U_BOOT_DRIVER(clk_boston) = {
 	.name = "boston_clock",
 	.id = UCLASS_CLK,
 	.of_match = clk_boston_match,
-	.ofdata_to_platdata = clk_boston_ofdata_to_platdata,
+	.of_to_plat = clk_boston_of_to_plat,
 	.plat_auto	= sizeof(struct clk_boston),
 	.ops = &clk_boston_ops,
 };
diff --git a/drivers/clk/clk_fixed_factor.c b/drivers/clk/clk_fixed_factor.c
index d68f79d4f39..e51f94a9371 100644
--- a/drivers/clk/clk_fixed_factor.c
+++ b/drivers/clk/clk_fixed_factor.c
@@ -38,7 +38,7 @@ const struct clk_ops clk_fixed_factor_ops = {
 	.get_rate = clk_fixed_factor_get_rate,
 };
 
-static int clk_fixed_factor_ofdata_to_platdata(struct udevice *dev)
+static int clk_fixed_factor_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	int err;
@@ -66,7 +66,7 @@ U_BOOT_DRIVER(clk_fixed_factor) = {
 	.name = "fixed_factor_clock",
 	.id = UCLASS_CLK,
 	.of_match = clk_fixed_factor_match,
-	.ofdata_to_platdata = clk_fixed_factor_ofdata_to_platdata,
+	.of_to_plat = clk_fixed_factor_of_to_plat,
 	.plat_auto	= sizeof(struct clk_fixed_factor),
 	.ops = &clk_fixed_factor_ops,
 };
diff --git a/drivers/clk/clk_fixed_rate.c b/drivers/clk/clk_fixed_rate.c
index 3b60434019b..12d81a7ff7a 100644
--- a/drivers/clk/clk_fixed_rate.c
+++ b/drivers/clk/clk_fixed_rate.c
@@ -24,7 +24,7 @@ const struct clk_ops clk_fixed_rate_ops = {
 	.enable = dummy_enable,
 };
 
-static int clk_fixed_rate_ofdata_to_platdata(struct udevice *dev)
+static int clk_fixed_rate_of_to_plat(struct udevice *dev)
 {
 	struct clk *clk = &to_clk_fixed_rate(dev)->clk;
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
@@ -50,7 +50,7 @@ U_BOOT_DRIVER(fixed_clock) = {
 	.name = "fixed_clock",
 	.id = UCLASS_CLK,
 	.of_match = clk_fixed_rate_match,
-	.ofdata_to_platdata = clk_fixed_rate_ofdata_to_platdata,
+	.of_to_plat = clk_fixed_rate_of_to_plat,
 	.plat_auto	= sizeof(struct clk_fixed_rate),
 	.ops = &clk_fixed_rate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c
index f12b010d5af..355362dd678 100644
--- a/drivers/clk/rockchip/clk_px30.c
+++ b/drivers/clk/rockchip/clk_px30.c
@@ -1432,7 +1432,7 @@ static int px30_clk_probe(struct udevice *dev)
 	return 0;
 }
 
-static int px30_clk_ofdata_to_platdata(struct udevice *dev)
+static int px30_clk_of_to_plat(struct udevice *dev)
 {
 	struct px30_clk_priv *priv = dev_get_priv(dev);
 
@@ -1481,7 +1481,7 @@ U_BOOT_DRIVER(rockchip_px30_cru) = {
 	.id		= UCLASS_CLK,
 	.of_match	= px30_clk_ids,
 	.priv_auto	= sizeof(struct px30_clk_priv),
-	.ofdata_to_platdata = px30_clk_ofdata_to_platdata,
+	.of_to_plat = px30_clk_of_to_plat,
 	.ops		= &px30_clk_ops,
 	.bind		= px30_clk_bind,
 	.probe		= px30_clk_probe,
@@ -1609,7 +1609,7 @@ static int px30_pmuclk_probe(struct udevice *dev)
 	return 0;
 }
 
-static int px30_pmuclk_ofdata_to_platdata(struct udevice *dev)
+static int px30_pmuclk_of_to_plat(struct udevice *dev)
 {
 	struct px30_pmuclk_priv *priv = dev_get_priv(dev);
 
@@ -1628,7 +1628,7 @@ U_BOOT_DRIVER(rockchip_px30_pmucru) = {
 	.id		= UCLASS_CLK,
 	.of_match	= px30_pmuclk_ids,
 	.priv_auto	= sizeof(struct px30_pmuclk_priv),
-	.ofdata_to_platdata = px30_pmuclk_ofdata_to_platdata,
+	.of_to_plat = px30_pmuclk_of_to_plat,
 	.ops		= &px30_pmuclk_ops,
 	.probe		= px30_pmuclk_probe,
 };
diff --git a/drivers/clk/rockchip/clk_rk3036.c b/drivers/clk/rockchip/clk_rk3036.c
index 8d11e242d05..07ef6133f29 100644
--- a/drivers/clk/rockchip/clk_rk3036.c
+++ b/drivers/clk/rockchip/clk_rk3036.c
@@ -318,7 +318,7 @@ static struct clk_ops rk3036_clk_ops = {
 	.set_rate	= rk3036_clk_set_rate,
 };
 
-static int rk3036_clk_ofdata_to_platdata(struct udevice *dev)
+static int rk3036_clk_of_to_plat(struct udevice *dev)
 {
 	struct rk3036_clk_priv *priv = dev_get_priv(dev);
 
@@ -376,7 +376,7 @@ U_BOOT_DRIVER(rockchip_rk3036_cru) = {
 	.id		= UCLASS_CLK,
 	.of_match	= rk3036_clk_ids,
 	.priv_auto	= sizeof(struct rk3036_clk_priv),
-	.ofdata_to_platdata = rk3036_clk_ofdata_to_platdata,
+	.of_to_plat = rk3036_clk_of_to_plat,
 	.ops		= &rk3036_clk_ops,
 	.bind		= rk3036_clk_bind,
 	.probe		= rk3036_clk_probe,
diff --git a/drivers/clk/rockchip/clk_rk3128.c b/drivers/clk/rockchip/clk_rk3128.c
index ac44ab442c7..9349e14830e 100644
--- a/drivers/clk/rockchip/clk_rk3128.c
+++ b/drivers/clk/rockchip/clk_rk3128.c
@@ -546,7 +546,7 @@ static struct clk_ops rk3128_clk_ops = {
 	.set_rate	= rk3128_clk_set_rate,
 };
 
-static int rk3128_clk_ofdata_to_platdata(struct udevice *dev)
+static int rk3128_clk_of_to_plat(struct udevice *dev)
 {
 	struct rk3128_clk_priv *priv = dev_get_priv(dev);
 
@@ -598,7 +598,7 @@ U_BOOT_DRIVER(rockchip_rk3128_cru) = {
 	.id		= UCLASS_CLK,
 	.of_match	= rk3128_clk_ids,
 	.priv_auto	= sizeof(struct rk3128_clk_priv),
-	.ofdata_to_platdata = rk3128_clk_ofdata_to_platdata,
+	.of_to_plat = rk3128_clk_of_to_plat,
 	.ops		= &rk3128_clk_ops,
 	.bind		= rk3128_clk_bind,
 	.probe		= rk3128_clk_probe,
diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c
index 4c4bd68f5d8..48bfe09b11f 100644
--- a/drivers/clk/rockchip/clk_rk3188.c
+++ b/drivers/clk/rockchip/clk_rk3188.c
@@ -538,7 +538,7 @@ static struct clk_ops rk3188_clk_ops = {
 	.set_rate	= rk3188_clk_set_rate,
 };
 
-static int rk3188_clk_ofdata_to_platdata(struct udevice *dev)
+static int rk3188_clk_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct rk3188_clk_priv *priv = dev_get_priv(dev);
@@ -620,6 +620,6 @@ U_BOOT_DRIVER(rockchip_rk3188_cru) = {
 	.plat_auto	= sizeof(struct rk3188_clk_plat),
 	.ops			= &rk3188_clk_ops,
 	.bind			= rk3188_clk_bind,
-	.ofdata_to_platdata	= rk3188_clk_ofdata_to_platdata,
+	.of_to_plat	= rk3188_clk_of_to_plat,
 	.probe			= rk3188_clk_probe,
 };
diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c
index 92e7ff384e1..c2f5fc0fd75 100644
--- a/drivers/clk/rockchip/clk_rk322x.c
+++ b/drivers/clk/rockchip/clk_rk322x.c
@@ -475,7 +475,7 @@ static struct clk_ops rk322x_clk_ops = {
 	.set_parent	= rk322x_clk_set_parent,
 };
 
-static int rk322x_clk_ofdata_to_platdata(struct udevice *dev)
+static int rk322x_clk_of_to_plat(struct udevice *dev)
 {
 	struct rk322x_clk_priv *priv = dev_get_priv(dev);
 
@@ -533,7 +533,7 @@ U_BOOT_DRIVER(rockchip_rk322x_cru) = {
 	.id		= UCLASS_CLK,
 	.of_match	= rk322x_clk_ids,
 	.priv_auto	= sizeof(struct rk322x_clk_priv),
-	.ofdata_to_platdata = rk322x_clk_ofdata_to_platdata,
+	.of_to_plat = rk322x_clk_of_to_plat,
 	.ops		= &rk322x_clk_ops,
 	.bind		= rk322x_clk_bind,
 	.probe		= rk322x_clk_probe,
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
index 588cfcc2327..e87fdfc54dd 100644
--- a/drivers/clk/rockchip/clk_rk3288.c
+++ b/drivers/clk/rockchip/clk_rk3288.c
@@ -954,7 +954,7 @@ static struct clk_ops rk3288_clk_ops = {
 #endif
 };
 
-static int rk3288_clk_ofdata_to_platdata(struct udevice *dev)
+static int rk3288_clk_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct rk3288_clk_priv *priv = dev_get_priv(dev);
@@ -1044,6 +1044,6 @@ U_BOOT_DRIVER(rockchip_rk3288_cru) = {
 	.plat_auto	= sizeof(struct rk3288_clk_plat),
 	.ops		= &rk3288_clk_ops,
 	.bind		= rk3288_clk_bind,
-	.ofdata_to_platdata	= rk3288_clk_ofdata_to_platdata,
+	.of_to_plat	= rk3288_clk_of_to_plat,
 	.probe		= rk3288_clk_probe,
 };
diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c
index c36512b6794..30589512ecc 100644
--- a/drivers/clk/rockchip/clk_rk3308.c
+++ b/drivers/clk/rockchip/clk_rk3308.c
@@ -1019,7 +1019,7 @@ static int rk3308_clk_probe(struct udevice *dev)
 	return ret;
 }
 
-static int rk3308_clk_ofdata_to_platdata(struct udevice *dev)
+static int rk3308_clk_of_to_plat(struct udevice *dev)
 {
 	struct rk3308_clk_priv *priv = dev_get_priv(dev);
 
@@ -1068,7 +1068,7 @@ U_BOOT_DRIVER(rockchip_rk3308_cru) = {
 	.id		= UCLASS_CLK,
 	.of_match	= rk3308_clk_ids,
 	.priv_auto	= sizeof(struct rk3308_clk_priv),
-	.ofdata_to_platdata = rk3308_clk_ofdata_to_platdata,
+	.of_to_plat = rk3308_clk_of_to_plat,
 	.ops		= &rk3308_clk_ops,
 	.bind		= rk3308_clk_bind,
 	.probe		= rk3308_clk_probe,
diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
index e28e0996c68..e2df71290f4 100644
--- a/drivers/clk/rockchip/clk_rk3328.c
+++ b/drivers/clk/rockchip/clk_rk3328.c
@@ -797,7 +797,7 @@ static int rk3328_clk_probe(struct udevice *dev)
 	return 0;
 }
 
-static int rk3328_clk_ofdata_to_platdata(struct udevice *dev)
+static int rk3328_clk_of_to_plat(struct udevice *dev)
 {
 	struct rk3328_clk_priv *priv = dev_get_priv(dev);
 
@@ -846,7 +846,7 @@ U_BOOT_DRIVER(rockchip_rk3328_cru) = {
 	.id		= UCLASS_CLK,
 	.of_match	= rk3328_clk_ids,
 	.priv_auto	= sizeof(struct rk3328_clk_priv),
-	.ofdata_to_platdata = rk3328_clk_ofdata_to_platdata,
+	.of_to_plat = rk3328_clk_of_to_plat,
 	.ops		= &rk3328_clk_ops,
 	.bind		= rk3328_clk_bind,
 	.probe		= rk3328_clk_probe,
diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c
index 08c98e01ce0..9267cac6bcd 100644
--- a/drivers/clk/rockchip/clk_rk3368.c
+++ b/drivers/clk/rockchip/clk_rk3368.c
@@ -593,7 +593,7 @@ static int rk3368_clk_probe(struct udevice *dev)
 	return 0;
 }
 
-static int rk3368_clk_ofdata_to_platdata(struct udevice *dev)
+static int rk3368_clk_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct rk3368_clk_priv *priv = dev_get_priv(dev);
@@ -647,7 +647,7 @@ U_BOOT_DRIVER(rockchip_rk3368_cru) = {
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
 	.plat_auto	= sizeof(struct rk3368_clk_plat),
 #endif
-	.ofdata_to_platdata = rk3368_clk_ofdata_to_platdata,
+	.of_to_plat = rk3368_clk_of_to_plat,
 	.ops		= &rk3368_clk_ops,
 	.bind		= rk3368_clk_bind,
 	.probe		= rk3368_clk_probe,
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index 2c0ff3b65b2..68d5dbb581c 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -1398,7 +1398,7 @@ static int rk3399_clk_probe(struct udevice *dev)
 	return 0;
 }
 
-static int rk3399_clk_ofdata_to_platdata(struct udevice *dev)
+static int rk3399_clk_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct rk3399_clk_priv *priv = dev_get_priv(dev);
@@ -1448,7 +1448,7 @@ U_BOOT_DRIVER(clk_rk3399) = {
 	.id		= UCLASS_CLK,
 	.of_match	= rk3399_clk_ids,
 	.priv_auto	= sizeof(struct rk3399_clk_priv),
-	.ofdata_to_platdata = rk3399_clk_ofdata_to_platdata,
+	.of_to_plat = rk3399_clk_of_to_plat,
 	.ops		= &rk3399_clk_ops,
 	.bind		= rk3399_clk_bind,
 	.probe		= rk3399_clk_probe,
@@ -1610,7 +1610,7 @@ static int rk3399_pmuclk_probe(struct udevice *dev)
 	return 0;
 }
 
-static int rk3399_pmuclk_ofdata_to_platdata(struct udevice *dev)
+static int rk3399_pmuclk_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct rk3399_pmuclk_priv *priv = dev_get_priv(dev);
@@ -1643,7 +1643,7 @@ U_BOOT_DRIVER(rockchip_rk3399_pmuclk) = {
 	.id		= UCLASS_CLK,
 	.of_match	= rk3399_pmuclk_ids,
 	.priv_auto	= sizeof(struct rk3399_pmuclk_priv),
-	.ofdata_to_platdata = rk3399_pmuclk_ofdata_to_platdata,
+	.of_to_plat = rk3399_pmuclk_of_to_plat,
 	.ops		= &rk3399_pmuclk_ops,
 	.probe		= rk3399_pmuclk_probe,
 	.bind		= rk3399_pmuclk_bind,
diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c
index efc07a05b1d..62bcf5a2ab3 100644
--- a/drivers/clk/rockchip/clk_rv1108.c
+++ b/drivers/clk/rockchip/clk_rv1108.c
@@ -662,7 +662,7 @@ static void rkclk_init(struct rv1108_cru *cru)
 	       aclk_bus, aclk_peri, hclk_peri, pclk_peri);
 }
 
-static int rv1108_clk_ofdata_to_platdata(struct udevice *dev)
+static int rv1108_clk_of_to_plat(struct udevice *dev)
 {
 	struct rv1108_clk_priv *priv = dev_get_priv(dev);
 
@@ -722,6 +722,6 @@ U_BOOT_DRIVER(clk_rv1108) = {
 	.priv_auto	= sizeof(struct rv1108_clk_priv),
 	.ops		= &rv1108_clk_ops,
 	.bind		= rv1108_clk_bind,
-	.ofdata_to_platdata	= rv1108_clk_ofdata_to_platdata,
+	.of_to_plat	= rv1108_clk_of_to_plat,
 	.probe		= rv1108_clk_probe,
 };
diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c
index 63a791f335e..0901b9260a1 100644
--- a/drivers/core/acpi.c
+++ b/drivers/core/acpi.c
@@ -269,7 +269,7 @@ int acpi_recurse_method(struct acpi_ctx *ctx, struct udevice *parent,
 		void *start = ctx->current;
 
 		log_debug("- method %d, %s %p\n", method, parent->name, func);
-		ret = device_ofdata_to_platdata(parent);
+		ret = device_of_to_plat(parent);
 		if (ret)
 			return log_msg_ret("ofdata", ret);
 		ret = func(parent, ctx);
diff --git a/drivers/core/device.c b/drivers/core/device.c
index b9515364405..7e36689cbd7 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -324,7 +324,7 @@ static void *alloc_priv(int size, uint flags)
 	return priv;
 }
 
-int device_ofdata_to_platdata(struct udevice *dev)
+int device_of_to_plat(struct udevice *dev)
 {
 	const struct driver *drv;
 	int size = 0;
@@ -338,7 +338,7 @@ int device_ofdata_to_platdata(struct udevice *dev)
 
 	/* Ensure all parents have ofdata */
 	if (dev->parent) {
-		ret = device_ofdata_to_platdata(dev->parent);
+		ret = device_of_to_plat(dev->parent);
 		if (ret)
 			goto fail;
 
@@ -389,9 +389,9 @@ int device_ofdata_to_platdata(struct udevice *dev)
 		}
 	}
 
-	if (drv->ofdata_to_platdata &&
+	if (drv->of_to_plat &&
 	    (CONFIG_IS_ENABLED(OF_PLATDATA) || dev_has_of_node(dev))) {
-		ret = drv->ofdata_to_platdata(dev);
+		ret = drv->of_to_plat(dev);
 		if (ret)
 			goto fail;
 	}
@@ -419,7 +419,7 @@ int device_probe(struct udevice *dev)
 	drv = dev->driver;
 	assert(drv);
 
-	ret = device_ofdata_to_platdata(dev);
+	ret = device_of_to_plat(dev);
 	if (ret)
 		goto fail;
 
@@ -861,7 +861,7 @@ int device_first_child_ofdata_err(struct udevice *parent, struct udevice **devp)
 	if (!dev)
 		return -ENODEV;
 
-	ret = device_ofdata_to_platdata(dev);
+	ret = device_of_to_plat(dev);
 	if (ret)
 		return ret;
 
@@ -879,7 +879,7 @@ int device_next_child_ofdata_err(struct udevice **devp)
 	if (!dev)
 		return -ENODEV;
 
-	ret = device_ofdata_to_platdata(dev);
+	ret = device_of_to_plat(dev);
 	if (ret)
 		return ret;
 
diff --git a/drivers/core/devres.c b/drivers/core/devres.c
index 88244698b0c..522b07d613f 100644
--- a/drivers/core/devres.c
+++ b/drivers/core/devres.c
@@ -23,7 +23,7 @@
 /** enum devres_phase - Shows where resource was allocated
  *
  * DEVRES_PHASE_BIND: In the bind() method
- * DEVRES_PHASE_OFDATA: In the ofdata_to_platdata() method
+ * DEVRES_PHASE_OFDATA: In the of_to_plat() method
  * DEVRES_PHASE_PROBE: In the probe() method
  */
 enum devres_phase {
diff --git a/drivers/core/root.c b/drivers/core/root.c
index 4bdac4f3a6a..4fa98f05081 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -69,8 +69,8 @@ void fix_drivers(void)
 			entry->remove += gd->reloc_off;
 		if (entry->unbind)
 			entry->unbind += gd->reloc_off;
-		if (entry->ofdata_to_platdata)
-			entry->ofdata_to_platdata += gd->reloc_off;
+		if (entry->of_to_plat)
+			entry->of_to_plat += gd->reloc_off;
 		if (entry->child_post_bind)
 			entry->child_post_bind += gd->reloc_off;
 		if (entry->child_pre_probe)
diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c
index e7c9b7a18ab..286961ca336 100644
--- a/drivers/ddr/altera/sdram_gen5.c
+++ b/drivers/ddr/altera/sdram_gen5.c
@@ -563,7 +563,7 @@ static unsigned long sdram_calculate_size(struct socfpga_sdr_ctrl *sdr_ctrl)
 	return temp;
 }
 
-static int altera_gen5_sdram_ofdata_to_platdata(struct udevice *dev)
+static int altera_gen5_sdram_of_to_plat(struct udevice *dev)
 {
 	struct altera_gen5_sdram_platdata *plat = dev->plat;
 
@@ -646,7 +646,7 @@ U_BOOT_DRIVER(altera_gen5_sdram) = {
 	.id = UCLASS_RAM,
 	.of_match = altera_gen5_sdram_ids,
 	.ops = &altera_gen5_sdram_ops,
-	.ofdata_to_platdata = altera_gen5_sdram_ofdata_to_platdata,
+	.of_to_plat = altera_gen5_sdram_of_to_plat,
 	.plat_auto	= sizeof(struct altera_gen5_sdram_platdata),
 	.probe = altera_gen5_sdram_probe,
 	.priv_auto	= sizeof(struct altera_gen5_sdram_priv),
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 081087aa967..0bd40c2a0da 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -230,7 +230,7 @@ phys_size_t sdram_calculate_size(struct altera_sdram_platdata *plat)
 	return size;
 }
 
-static int altera_sdram_ofdata_to_platdata(struct udevice *dev)
+static int altera_sdram_of_to_plat(struct udevice *dev)
 {
 	struct altera_sdram_platdata *plat = dev->plat;
 	fdt_addr_t addr;
@@ -303,7 +303,7 @@ U_BOOT_DRIVER(altera_sdram) = {
 	.id = UCLASS_RAM,
 	.of_match = altera_sdram_ids,
 	.ops = &altera_sdram_ops,
-	.ofdata_to_platdata = altera_sdram_ofdata_to_platdata,
+	.of_to_plat = altera_sdram_of_to_plat,
 	.plat_auto	= sizeof(struct altera_sdram_platdata),
 	.probe = altera_sdram_probe,
 	.priv_auto	= sizeof(struct altera_sdram_priv),
diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c
index b13a4ee4e8a..8129317ba1b 100644
--- a/drivers/demo/demo-shape.c
+++ b/drivers/demo/demo-shape.c
@@ -140,7 +140,7 @@ static const struct demo_ops shape_ops = {
 	.set_light = set_light,
 };
 
-static int shape_ofdata_to_platdata(struct udevice *dev)
+static int shape_of_to_plat(struct udevice *dev)
 {
 	struct dm_demo_pdata *pdata = dev_get_plat(dev);
 	int ret;
@@ -189,7 +189,7 @@ U_BOOT_DRIVER(demo_shape_drv) = {
 	.name	= "demo_shape_drv",
 	.of_match = demo_shape_id,
 	.id	= UCLASS_DEMO,
-	.ofdata_to_platdata = shape_ofdata_to_platdata,
+	.of_to_plat = shape_of_to_plat,
 	.ops	= &shape_ops,
 	.probe = dm_shape_probe,
 	.remove = dm_shape_remove,
diff --git a/drivers/demo/demo-simple.c b/drivers/demo/demo-simple.c
index 39b370cd9b5..28b271f7791 100644
--- a/drivers/demo/demo-simple.c
+++ b/drivers/demo/demo-simple.c
@@ -26,7 +26,7 @@ static const struct demo_ops simple_ops = {
 	.hello = simple_hello,
 };
 
-static int demo_shape_ofdata_to_platdata(struct udevice *dev)
+static int demo_shape_of_to_plat(struct udevice *dev)
 {
 	/* Parse the data that is common with all demo devices */
 	return demo_parse_dt(dev);
@@ -41,7 +41,7 @@ U_BOOT_DRIVER(demo_simple_drv) = {
 	.name	= "demo_simple_drv",
 	.of_match = demo_shape_id,
 	.id	= UCLASS_DEMO,
-	.ofdata_to_platdata = demo_shape_ofdata_to_platdata,
+	.of_to_plat = demo_shape_of_to_plat,
 	.ops	= &simple_ops,
 	.plat_auto	= sizeof(struct dm_demo_pdata),
 };
diff --git a/drivers/dma/ti-edma3.c b/drivers/dma/ti-edma3.c
index 4272f4cab80..ec3dc62d2f3 100644
--- a/drivers/dma/ti-edma3.c
+++ b/drivers/dma/ti-edma3.c
@@ -542,7 +542,7 @@ static int ti_edma3_transfer(struct udevice *dev, int direction, void *dst,
 	return 0;
 }
 
-static int ti_edma3_ofdata_to_platdata(struct udevice *dev)
+static int ti_edma3_of_to_plat(struct udevice *dev)
 {
 	struct ti_edma3_priv *priv = dev_get_priv(dev);
 
@@ -574,7 +574,7 @@ U_BOOT_DRIVER(ti_edma3) = {
 	.id	= UCLASS_DMA,
 	.of_match = ti_edma3_ids,
 	.ops	= &ti_edma3_ops,
-	.ofdata_to_platdata = ti_edma3_ofdata_to_platdata,
+	.of_to_plat = ti_edma3_of_to_plat,
 	.probe	= ti_edma3_probe,
 	.priv_auto	= sizeof(struct ti_edma3_priv),
 };
diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c
index 0b1861a2609..24e047e66a8 100644
--- a/drivers/gpio/altera_pio.c
+++ b/drivers/gpio/altera_pio.c
@@ -84,7 +84,7 @@ static int altera_pio_probe(struct udevice *dev)
 	return 0;
 }
 
-static int altera_pio_ofdata_to_platdata(struct udevice *dev)
+static int altera_pio_of_to_plat(struct udevice *dev)
 {
 	struct altera_pio_platdata *plat = dev_get_plat(dev);
 
@@ -116,7 +116,7 @@ U_BOOT_DRIVER(altera_pio) = {
 	.id		= UCLASS_GPIO,
 	.of_match	= altera_pio_ids,
 	.ops		= &altera_pio_ops,
-	.ofdata_to_platdata = altera_pio_ofdata_to_platdata,
+	.of_to_plat = altera_pio_of_to_plat,
 	.plat_auto	= sizeof(struct altera_pio_platdata),
 	.probe		= altera_pio_probe,
 };
diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c
index 7c3f24e6734..a348c68a7ef 100644
--- a/drivers/gpio/bcm2835_gpio.c
+++ b/drivers/gpio/bcm2835_gpio.c
@@ -116,7 +116,7 @@ static int bcm2835_gpio_probe(struct udevice *dev)
 }
 
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-static int bcm2835_gpio_ofdata_to_platdata(struct udevice *dev)
+static int bcm2835_gpio_of_to_plat(struct udevice *dev)
 {
 	struct bcm2835_gpio_platdata *plat = dev_get_plat(dev);
 	fdt_addr_t addr;
@@ -133,7 +133,7 @@ static int bcm2835_gpio_ofdata_to_platdata(struct udevice *dev)
 U_BOOT_DRIVER(gpio_bcm2835) = {
 	.name	= "gpio_bcm2835",
 	.id	= UCLASS_GPIO,
-	.ofdata_to_platdata = of_match_ptr(bcm2835_gpio_ofdata_to_platdata),
+	.of_to_plat = of_match_ptr(bcm2835_gpio_of_to_plat),
 	.plat_auto	= sizeof(struct bcm2835_gpio_platdata),
 	.ops	= &gpio_bcm2835_ops,
 	.probe	= bcm2835_gpio_probe,
diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c
index ff61a4cb11e..b47d65d4df2 100644
--- a/drivers/gpio/da8xx_gpio.c
+++ b/drivers/gpio/da8xx_gpio.c
@@ -540,7 +540,7 @@ static const struct udevice_id davinci_gpio_ids[] = {
 	{ }
 };
 
-static int davinci_gpio_ofdata_to_platdata(struct udevice *dev)
+static int davinci_gpio_of_to_plat(struct udevice *dev)
 {
 	struct davinci_gpio_platdata *plat = dev_get_plat(dev);
 	fdt_addr_t addr;
@@ -557,7 +557,7 @@ U_BOOT_DRIVER(ti_dm6441_gpio) = {
 	.name	= "ti_dm6441_gpio",
 	.id	= UCLASS_GPIO,
 	.ops	= &gpio_davinci_ops,
-	.ofdata_to_platdata = of_match_ptr(davinci_gpio_ofdata_to_platdata),
+	.of_to_plat = of_match_ptr(davinci_gpio_of_to_plat),
 	.of_match = davinci_gpio_ids,
 	.bind   = dm_scan_fdt_dev,
 	.plat_auto	= sizeof(struct davinci_gpio_platdata),
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index 3140a3fd092..cd0b9cab07d 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -239,7 +239,7 @@ struct gpio_hog_data {
 	u32 val[2];
 };
 
-static int gpio_hog_ofdata_to_platdata(struct udevice *dev)
+static int gpio_hog_of_to_plat(struct udevice *dev)
 {
 	struct gpio_hog_data *plat = dev_get_plat(dev);
 	const char *nodename;
@@ -338,7 +338,7 @@ int gpio_hog_lookup_name(const char *name, struct gpio_desc **desc)
 U_BOOT_DRIVER(gpio_hog) = {
 	.name	= "gpio_hog",
 	.id	= UCLASS_NOP,
-	.ofdata_to_platdata = gpio_hog_ofdata_to_platdata,
+	.of_to_plat = gpio_hog_of_to_plat,
 	.probe = gpio_hog_probe,
 	.priv_auto	= sizeof(struct gpio_hog_priv),
 	.plat_auto	= sizeof(struct gpio_hog_data),
diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c
index 2b9e1a284a3..9cd0745625e 100644
--- a/drivers/gpio/intel_broadwell_gpio.c
+++ b/drivers/gpio/intel_broadwell_gpio.c
@@ -139,7 +139,7 @@ static int broadwell_gpio_probe(struct udevice *dev)
 	return 0;
 }
 
-static int broadwell_gpio_ofdata_to_platdata(struct udevice *dev)
+static int broadwell_gpio_of_to_plat(struct udevice *dev)
 {
 	struct broadwell_bank_platdata *plat = dev_get_plat(dev);
 	u32 gpiobase;
@@ -182,7 +182,7 @@ U_BOOT_DRIVER(gpio_broadwell) = {
 	.id	= UCLASS_GPIO,
 	.of_match = intel_broadwell_gpio_ids,
 	.ops	= &gpio_broadwell_ops,
-	.ofdata_to_platdata	= broadwell_gpio_ofdata_to_platdata,
+	.of_to_plat	= broadwell_gpio_of_to_plat,
 	.probe	= broadwell_gpio_probe,
 	.priv_auto	= sizeof(struct broadwell_bank_priv),
 	.plat_auto	= sizeof(struct broadwell_bank_platdata),
diff --git a/drivers/gpio/intel_gpio.c b/drivers/gpio/intel_gpio.c
index c3b67f24d8f..41540d8ebc6 100644
--- a/drivers/gpio/intel_gpio.c
+++ b/drivers/gpio/intel_gpio.c
@@ -164,7 +164,7 @@ static int intel_gpio_probe(struct udevice *dev)
 	return 0;
 }
 
-static int intel_gpio_ofdata_to_platdata(struct udevice *dev)
+static int intel_gpio_of_to_plat(struct udevice *dev)
 {
 	struct gpio_dev_priv *upriv = dev_get_uclass_priv(dev);
 	struct intel_pinctrl_priv *pinctrl_priv = dev_get_priv(dev->parent);
@@ -198,6 +198,6 @@ U_BOOT_DRIVER(intel_gpio) = {
 	.id	= UCLASS_GPIO,
 	.of_match = intel_intel_gpio_ids,
 	.ops	= &gpio_intel_ops,
-	.ofdata_to_platdata	= intel_gpio_ofdata_to_platdata,
+	.of_to_plat	= intel_gpio_of_to_plat,
 	.probe	= intel_gpio_probe,
 };
diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c
index cfb2ddab78b..add13d89a71 100644
--- a/drivers/gpio/intel_ich6_gpio.c
+++ b/drivers/gpio/intel_ich6_gpio.c
@@ -93,7 +93,7 @@ static int _ich6_gpio_set_direction(uint16_t base, unsigned offset, int dir)
 	return 0;
 }
 
-static int gpio_ich6_ofdata_to_platdata(struct udevice *dev)
+static int gpio_ich6_of_to_plat(struct udevice *dev)
 {
 	struct ich6_bank_platdata *plat = dev_get_plat(dev);
 	u32 gpiobase;
@@ -234,7 +234,7 @@ U_BOOT_DRIVER(gpio_ich6) = {
 	.id	= UCLASS_GPIO,
 	.of_match = intel_ich6_gpio_ids,
 	.ops	= &gpio_ich6_ops,
-	.ofdata_to_platdata	= gpio_ich6_ofdata_to_platdata,
+	.of_to_plat	= gpio_ich6_of_to_plat,
 	.probe	= ich6_gpio_probe,
 	.priv_auto	= sizeof(struct ich6_bank_priv),
 	.plat_auto	= sizeof(struct ich6_bank_platdata),
diff --git a/drivers/gpio/iproc_gpio.c b/drivers/gpio/iproc_gpio.c
index 32a849e2708..8bc8783f62c 100644
--- a/drivers/gpio/iproc_gpio.c
+++ b/drivers/gpio/iproc_gpio.c
@@ -218,7 +218,7 @@ static int iproc_gpio_get_function(struct udevice *dev, u32 gpio)
 		return GPIOF_INPUT;
 }
 
-static int iproc_gpio_ofdata_to_platdata(struct udevice *dev)
+static int iproc_gpio_of_to_plat(struct udevice *dev)
 {
 	struct iproc_gpio_platdata *plat = dev_get_plat(dev);
 	struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
@@ -285,6 +285,6 @@ U_BOOT_DRIVER(iproc_gpio) = {
 	.id			= UCLASS_GPIO,
 	.of_match		= iproc_gpio_ids,
 	.ops			= &iproc_gpio_ops,
-	.ofdata_to_platdata	= iproc_gpio_ofdata_to_platdata,
+	.of_to_plat	= iproc_gpio_of_to_plat,
 	.plat_auto	= sizeof(struct iproc_gpio_platdata),
 };
diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c
index 245b43f5351..a35e4de761f 100644
--- a/drivers/gpio/mpc83xx_spisel_boot.c
+++ b/drivers/gpio/mpc83xx_spisel_boot.c
@@ -61,7 +61,7 @@ static int mpc83xx_spisel_boot_get_function(struct udevice *dev, uint gpio)
 }
 
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-static int mpc83xx_spisel_boot_ofdata_to_platdata(struct udevice *dev)
+static int mpc83xx_spisel_boot_of_to_plat(struct udevice *dev)
 {
 	struct mpc8xxx_gpio_plat *plat = dev_get_plat(dev);
 	fdt_addr_t addr;
@@ -140,7 +140,7 @@ U_BOOT_DRIVER(spisel_boot_mpc83xx) = {
 	.id	= UCLASS_GPIO,
 	.ops	= &mpc83xx_spisel_boot_ops,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-	.ofdata_to_platdata = mpc83xx_spisel_boot_ofdata_to_platdata,
+	.of_to_plat = mpc83xx_spisel_boot_of_to_plat,
 	.plat_auto	= sizeof(struct mpc8xxx_gpio_plat),
 	.of_match = mpc83xx_spisel_boot_ids,
 #endif
diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index 0933b900b8e..dfc1dc67d59 100644
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -183,7 +183,7 @@ static int mpc8xxx_gpio_get_function(struct udevice *dev, uint gpio)
 }
 
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-static int mpc8xxx_gpio_ofdata_to_platdata(struct udevice *dev)
+static int mpc8xxx_gpio_of_to_plat(struct udevice *dev)
 {
 	struct mpc8xxx_gpio_plat *plat = dev_get_plat(dev);
 	struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
@@ -294,7 +294,7 @@ U_BOOT_DRIVER(gpio_mpc8xxx) = {
 	.id	= UCLASS_GPIO,
 	.ops	= &gpio_mpc8xxx_ops,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-	.ofdata_to_platdata = mpc8xxx_gpio_ofdata_to_platdata,
+	.of_to_plat = mpc8xxx_gpio_of_to_plat,
 	.plat_auto	= sizeof(struct mpc8xxx_gpio_plat),
 	.of_match = mpc8xxx_gpio_ids,
 #endif
diff --git a/drivers/gpio/msm_gpio.c b/drivers/gpio/msm_gpio.c
index 0feafb30ee3..af6c8383aa6 100644
--- a/drivers/gpio/msm_gpio.c
+++ b/drivers/gpio/msm_gpio.c
@@ -101,7 +101,7 @@ static int msm_gpio_probe(struct udevice *dev)
 	return priv->base == FDT_ADDR_T_NONE ? -EINVAL : 0;
 }
 
-static int msm_gpio_ofdata_to_platdata(struct udevice *dev)
+static int msm_gpio_of_to_plat(struct udevice *dev)
 {
 	struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
 
@@ -126,7 +126,7 @@ U_BOOT_DRIVER(gpio_msm) = {
 	.name	= "gpio_msm",
 	.id	= UCLASS_GPIO,
 	.of_match = msm_gpio_ids,
-	.ofdata_to_platdata = msm_gpio_ofdata_to_platdata,
+	.of_to_plat = msm_gpio_of_to_plat,
 	.probe	= msm_gpio_probe,
 	.ops	= &gpio_msm_ops,
 	.priv_auto	= sizeof(struct msm_gpio_bank),
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index ecdeaec2b12..9fc217ae6ae 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -307,7 +307,7 @@ static int mxc_gpio_probe(struct udevice *dev)
 	return 0;
 }
 
-static int mxc_gpio_ofdata_to_platdata(struct udevice *dev)
+static int mxc_gpio_of_to_plat(struct udevice *dev)
 {
 	struct mxc_gpio_plat *plat = dev_get_plat(dev);
 	if (!CONFIG_IS_ENABLED(OF_PLATDATA)) {
@@ -338,7 +338,7 @@ U_BOOT_DRIVER(gpio_mxc) = {
 	.id	= UCLASS_GPIO,
 	.ops	= &gpio_mxc_ops,
 	.probe	= mxc_gpio_probe,
-	.ofdata_to_platdata = mxc_gpio_ofdata_to_platdata,
+	.of_to_plat = mxc_gpio_of_to_plat,
 	.plat_auto	= sizeof(struct mxc_gpio_plat),
 	.priv_auto	= sizeof(struct mxc_bank_info),
 	.of_match = mxc_gpio_ids,
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index 7ef34c65584..30daf4a74e0 100644
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -262,7 +262,7 @@ static int mxs_gpio_probe(struct udevice *dev)
 }
 
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
-static int mxs_ofdata_to_platdata(struct udevice *dev)
+static int mxs_of_to_plat(struct udevice *dev)
 {
 	struct mxs_gpio_platdata *plat = dev->plat;
 	struct fdtdec_phandle_args args;
@@ -302,7 +302,7 @@ U_BOOT_DRIVER(fsl_imx23_gpio) = {
 	.plat_auto	= sizeof(struct mxs_gpio_platdata),
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = mxs_gpio_ids,
-	.ofdata_to_platdata = mxs_ofdata_to_platdata,
+	.of_to_plat = mxs_of_to_plat,
 #endif
 };
 
diff --git a/drivers/gpio/nx_gpio.c b/drivers/gpio/nx_gpio.c
index d69a22aff76..8c5fd670758 100644
--- a/drivers/gpio/nx_gpio.c
+++ b/drivers/gpio/nx_gpio.c
@@ -212,7 +212,7 @@ static int nx_gpio_probe(struct udevice *dev)
 	return 0;
 }
 
-static int nx_gpio_ofdata_to_platdata(struct udevice *dev)
+static int nx_gpio_of_to_plat(struct udevice *dev)
 {
 	struct nx_gpio_platdata *plat = dev_get_plat(dev);
 
@@ -244,7 +244,7 @@ U_BOOT_DRIVER(nx_gpio) = {
 	.id		= UCLASS_GPIO,
 	.of_match	= nx_gpio_ids,
 	.ops		= &nx_gpio_ops,
-	.ofdata_to_platdata = nx_gpio_ofdata_to_platdata,
+	.of_to_plat = nx_gpio_of_to_plat,
 	.plat_auto	= sizeof(struct nx_gpio_platdata),
 	.probe		= nx_gpio_probe,
 };
diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c
index 6581dca6735..665f46d555a 100644
--- a/drivers/gpio/omap_gpio.c
+++ b/drivers/gpio/omap_gpio.c
@@ -342,7 +342,7 @@ static const struct udevice_id omap_gpio_ids[] = {
 	{ }
 };
 
-static int omap_gpio_ofdata_to_platdata(struct udevice *dev)
+static int omap_gpio_of_to_plat(struct udevice *dev)
 {
 	struct omap_gpio_platdata *plat = dev_get_plat(dev);
 	fdt_addr_t addr;
@@ -362,7 +362,7 @@ U_BOOT_DRIVER(gpio_omap) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = omap_gpio_ids,
-	.ofdata_to_platdata = of_match_ptr(omap_gpio_ofdata_to_platdata),
+	.of_to_plat = of_match_ptr(omap_gpio_of_to_plat),
 	.plat_auto	= sizeof(struct omap_gpio_platdata),
 #endif
 #else
diff --git a/drivers/gpio/pcf8575_gpio.c b/drivers/gpio/pcf8575_gpio.c
index 570486fc484..3eed9e93c2c 100644
--- a/drivers/gpio/pcf8575_gpio.c
+++ b/drivers/gpio/pcf8575_gpio.c
@@ -175,7 +175,7 @@ U_BOOT_DRIVER(gpio_pcf8575) = {
 	.id	= UCLASS_GPIO,
 	.ops	= &pcf8575_gpio_ops,
 	.of_match = pcf8575_gpio_ids,
-	.ofdata_to_platdata = pcf8575_ofdata_platdata,
+	.of_to_plat = pcf8575_ofdata_platdata,
 	.probe	= pcf8575_gpio_probe,
 	.plat_auto	= sizeof(struct pcf8575_chip),
 };
diff --git a/drivers/gpio/pm8916_gpio.c b/drivers/gpio/pm8916_gpio.c
index 20d5bd55d00..40b0f2578b9 100644
--- a/drivers/gpio/pm8916_gpio.c
+++ b/drivers/gpio/pm8916_gpio.c
@@ -187,7 +187,7 @@ static int pm8916_gpio_probe(struct udevice *dev)
 	return 0;
 }
 
-static int pm8916_gpio_ofdata_to_platdata(struct udevice *dev)
+static int pm8916_gpio_of_to_plat(struct udevice *dev)
 {
 	struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
 
@@ -209,7 +209,7 @@ U_BOOT_DRIVER(gpio_pm8916) = {
 	.name	= "gpio_pm8916",
 	.id	= UCLASS_GPIO,
 	.of_match = pm8916_gpio_ids,
-	.ofdata_to_platdata = pm8916_gpio_ofdata_to_platdata,
+	.of_to_plat = pm8916_gpio_of_to_plat,
 	.probe	= pm8916_gpio_probe,
 	.ops	= &pm8916_gpio_ops,
 	.priv_auto	= sizeof(struct pm8916_gpio_bank),
@@ -272,7 +272,7 @@ static int pm8941_pwrkey_probe(struct udevice *dev)
 	return 0;
 }
 
-static int pm8941_pwrkey_ofdata_to_platdata(struct udevice *dev)
+static int pm8941_pwrkey_of_to_plat(struct udevice *dev)
 {
 	struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
 
@@ -294,7 +294,7 @@ U_BOOT_DRIVER(pwrkey_pm8941) = {
 	.name	= "pwrkey_pm8916",
 	.id	= UCLASS_GPIO,
 	.of_match = pm8941_pwrkey_ids,
-	.ofdata_to_platdata = pm8941_pwrkey_ofdata_to_platdata,
+	.of_to_plat = pm8941_pwrkey_of_to_plat,
 	.probe	= pm8941_pwrkey_probe,
 	.ops	= &pm8941_pwrkey_ops,
 	.priv_auto	= sizeof(struct pm8916_gpio_bank),
diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c
index fa871305baf..2708838adf6 100644
--- a/drivers/gpio/sandbox.c
+++ b/drivers/gpio/sandbox.c
@@ -278,7 +278,7 @@ static const struct dm_gpio_ops gpio_sandbox_ops = {
 #endif
 };
 
-static int sandbox_gpio_ofdata_to_platdata(struct udevice *dev)
+static int sandbox_gpio_of_to_plat(struct udevice *dev)
 {
 	struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
 
@@ -318,7 +318,7 @@ U_BOOT_DRIVER(sandbox_gpio) = {
 	.name	= "sandbox_gpio",
 	.id	= UCLASS_GPIO,
 	.of_match = sandbox_gpio_ids,
-	.ofdata_to_platdata = sandbox_gpio_ofdata_to_platdata,
+	.of_to_plat = sandbox_gpio_of_to_plat,
 	.probe	= gpio_sandbox_probe,
 	.remove	= gpio_sandbox_remove,
 	.ops	= &gpio_sandbox_ops,
diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c
index 79d3ed49e30..933cace5bec 100644
--- a/drivers/gpio/sifive-gpio.c
+++ b/drivers/gpio/sifive-gpio.c
@@ -154,7 +154,7 @@ static const struct dm_gpio_ops sifive_gpio_ops = {
 	.get_function		= sifive_gpio_get_function,
 };
 
-static int sifive_gpio_ofdata_to_platdata(struct udevice *dev)
+static int sifive_gpio_of_to_plat(struct udevice *dev)
 {
 	struct sifive_gpio_platdata *plat = dev_get_plat(dev);
 	fdt_addr_t addr;
@@ -171,7 +171,7 @@ U_BOOT_DRIVER(gpio_sifive) = {
 	.name	= "gpio_sifive",
 	.id	= UCLASS_GPIO,
 	.of_match = sifive_gpio_match,
-	.ofdata_to_platdata = of_match_ptr(sifive_gpio_ofdata_to_platdata),
+	.of_to_plat = of_match_ptr(sifive_gpio_of_to_plat),
 	.plat_auto	= sizeof(struct sifive_gpio_platdata),
 	.ops	= &sifive_gpio_ops,
 	.probe	= sifive_gpio_probe,
diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c
index bd0623bcfa7..d2e526d7ab8 100644
--- a/drivers/gpio/vybrid_gpio.c
+++ b/drivers/gpio/vybrid_gpio.c
@@ -130,7 +130,7 @@ U_BOOT_DRIVER(gpio_vybrid) = {
 	.id	= UCLASS_GPIO,
 	.ops	= &gpio_vybrid_ops,
 	.of_match = vybrid_gpio_ids,
-	.ofdata_to_platdata = vybrid_gpio_odata_to_platdata,
+	.of_to_plat = vybrid_gpio_odata_to_platdata,
 	.probe	= vybrid_gpio_probe,
 	.priv_auto	= sizeof(struct vybrid_gpios),
 	.plat_auto	= sizeof(struct vybrid_gpio_platdata),
diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c
index 847f399dafb..7bc758b1669 100644
--- a/drivers/gpio/xilinx_gpio.c
+++ b/drivers/gpio/xilinx_gpio.c
@@ -263,7 +263,7 @@ static int xilinx_gpio_probe(struct udevice *dev)
 	return 0;
 }
 
-static int xilinx_gpio_ofdata_to_platdata(struct udevice *dev)
+static int xilinx_gpio_of_to_plat(struct udevice *dev)
 {
 	struct xilinx_gpio_platdata *plat = dev_get_plat(dev);
 	int is_dual;
@@ -301,7 +301,7 @@ U_BOOT_DRIVER(xilinx_gpio) = {
 	.id = UCLASS_GPIO,
 	.ops = &xilinx_gpio_ops,
 	.of_match = xilinx_gpio_ids,
-	.ofdata_to_platdata = xilinx_gpio_ofdata_to_platdata,
+	.of_to_plat = xilinx_gpio_of_to_plat,
 	.probe = xilinx_gpio_probe,
 	.plat_auto	= sizeof(struct xilinx_gpio_platdata),
 	.priv_auto	= sizeof(struct xilinx_gpio_privdata),
diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c
index a273aff6e0e..ffbe7b47080 100644
--- a/drivers/gpio/zynq_gpio.c
+++ b/drivers/gpio/zynq_gpio.c
@@ -388,7 +388,7 @@ static int zynq_gpio_probe(struct udevice *dev)
 	return 0;
 }
 
-static int zynq_gpio_ofdata_to_platdata(struct udevice *dev)
+static int zynq_gpio_of_to_plat(struct udevice *dev)
 {
 	struct zynq_gpio_platdata *plat = dev_get_plat(dev);
 
@@ -405,7 +405,7 @@ U_BOOT_DRIVER(gpio_zynq) = {
 	.id	= UCLASS_GPIO,
 	.ops	= &gpio_zynq_ops,
 	.of_match = zynq_gpio_ids,
-	.ofdata_to_platdata = zynq_gpio_ofdata_to_platdata,
+	.of_to_plat = zynq_gpio_of_to_plat,
 	.probe	= zynq_gpio_probe,
 	.plat_auto	= sizeof(struct zynq_gpio_platdata),
 };
diff --git a/drivers/i2c/acpi_i2c.c b/drivers/i2c/acpi_i2c.c
index ef12789e7ff..142f41178c1 100644
--- a/drivers/i2c/acpi_i2c.c
+++ b/drivers/i2c/acpi_i2c.c
@@ -174,7 +174,7 @@ int acpi_i2c_fill_ssdt(const struct udevice *dev, struct acpi_ctx *ctx)
 	return 0;
 }
 
-int acpi_i2c_ofdata_to_platdata(struct udevice *dev)
+int acpi_i2c_of_to_plat(struct udevice *dev)
 {
 	struct acpi_i2c_priv *priv = dev_get_priv(dev);
 
diff --git a/drivers/i2c/acpi_i2c.h b/drivers/i2c/acpi_i2c.h
index 1f4be296016..fc6616ade66 100644
--- a/drivers/i2c/acpi_i2c.h
+++ b/drivers/i2c/acpi_i2c.h
@@ -10,6 +10,6 @@
 
 extern struct acpi_ops acpi_i2c_ops;
 
-int acpi_i2c_ofdata_to_platdata(struct udevice *dev);
+int acpi_i2c_of_to_plat(struct udevice *dev);
 
 #endif
diff --git a/drivers/i2c/ast_i2c.c b/drivers/i2c/ast_i2c.c
index a4caba46baf..2d3fecaa14e 100644
--- a/drivers/i2c/ast_i2c.c
+++ b/drivers/i2c/ast_i2c.c
@@ -87,7 +87,7 @@ static void ast_i2c_init_bus(struct udevice *dev)
 	       | I2CD_INTR_ABNORMAL, &priv->regs->icr);
 }
 
-static int ast_i2c_ofdata_to_platdata(struct udevice *dev)
+static int ast_i2c_of_to_plat(struct udevice *dev)
 {
 	struct ast_i2c_priv *priv = dev_get_priv(dev);
 	int ret;
@@ -351,7 +351,7 @@ U_BOOT_DRIVER(ast_i2c) = {
 	.id = UCLASS_I2C,
 	.of_match = ast_i2c_ids,
 	.probe = ast_i2c_probe,
-	.ofdata_to_platdata = ast_i2c_ofdata_to_platdata,
+	.of_to_plat = ast_i2c_of_to_plat,
 	.priv_auto	= sizeof(struct ast_i2c_priv),
 	.ops = &ast_i2c_ops,
 };
diff --git a/drivers/i2c/at91_i2c.c b/drivers/i2c/at91_i2c.c
index db2fbc9d66d..3eb6db4878d 100644
--- a/drivers/i2c/at91_i2c.c
+++ b/drivers/i2c/at91_i2c.c
@@ -219,7 +219,7 @@ int at91_i2c_get_bus_speed(struct udevice *dev)
 	return bus->speed;
 }
 
-static int at91_i2c_ofdata_to_platdata(struct udevice *dev)
+static int at91_i2c_of_to_plat(struct udevice *dev)
 {
 	const void *blob = gd->fdt_blob;
 	struct at91_i2c_bus *bus = dev_get_priv(dev);
@@ -317,7 +317,7 @@ U_BOOT_DRIVER(i2c_at91) = {
 	.id	= UCLASS_I2C,
 	.of_match = at91_i2c_ids,
 	.probe = at91_i2c_probe,
-	.ofdata_to_platdata = at91_i2c_ofdata_to_platdata,
+	.of_to_plat = at91_i2c_of_to_plat,
 	.per_child_auto	= sizeof(struct dm_i2c_chip),
 	.priv_auto	= sizeof(struct at91_i2c_bus),
 	.ops	= &at91_i2c_ops,
diff --git a/drivers/i2c/cros_ec_tunnel.c b/drivers/i2c/cros_ec_tunnel.c
index 1cc5c0618e5..970b91cfd30 100644
--- a/drivers/i2c/cros_ec_tunnel.c
+++ b/drivers/i2c/cros_ec_tunnel.c
@@ -29,7 +29,7 @@ static int cros_ec_i2c_xfer(struct udevice *dev, struct i2c_msg *msg,
 	return cros_ec_i2c_tunnel(dev->parent, i2c_bus->remote_bus, msg, nmsgs);
 }
 
-static int cros_ec_i2c_ofdata_to_platdata(struct udevice *dev)
+static int cros_ec_i2c_of_to_plat(struct udevice *dev)
 {
 	struct cros_ec_i2c_bus *i2c_bus = dev_get_priv(dev);
 	const void *blob = gd->fdt_blob;
@@ -55,7 +55,7 @@ U_BOOT_DRIVER(cros_ec_tunnel) = {
 	.name	= "cros_ec_tunnel",
 	.id	= UCLASS_I2C,
 	.of_match = cros_ec_i2c_ids,
-	.ofdata_to_platdata = cros_ec_i2c_ofdata_to_platdata,
+	.of_to_plat = cros_ec_i2c_of_to_plat,
 	.priv_auto	= sizeof(struct cros_ec_i2c_bus),
 	.ops	= &cros_ec_i2c_ops,
 };
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c
index c8927ebfeb8..39c45e032ff 100644
--- a/drivers/i2c/designware_i2c.c
+++ b/drivers/i2c/designware_i2c.c
@@ -762,7 +762,7 @@ static int designware_i2c_probe_chip(struct udevice *bus, uint chip_addr,
 	return ret;
 }
 
-int designware_i2c_ofdata_to_platdata(struct udevice *bus)
+int designware_i2c_of_to_plat(struct udevice *bus)
 {
 	struct dw_i2c *priv = dev_get_priv(bus);
 	int ret;
@@ -840,7 +840,7 @@ U_BOOT_DRIVER(i2c_designware) = {
 	.name	= "i2c_designware",
 	.id	= UCLASS_I2C,
 	.of_match = designware_i2c_ids,
-	.ofdata_to_platdata = designware_i2c_ofdata_to_platdata,
+	.of_to_plat = designware_i2c_of_to_plat,
 	.probe	= designware_i2c_probe,
 	.priv_auto	= sizeof(struct dw_i2c),
 	.remove = designware_i2c_remove,
diff --git a/drivers/i2c/designware_i2c.h b/drivers/i2c/designware_i2c.h
index 18acf4e841b..9b2349a0a2c 100644
--- a/drivers/i2c/designware_i2c.h
+++ b/drivers/i2c/designware_i2c.h
@@ -212,7 +212,7 @@ extern const struct dm_i2c_ops designware_i2c_ops;
 
 int designware_i2c_probe(struct udevice *bus);
 int designware_i2c_remove(struct udevice *dev);
-int designware_i2c_ofdata_to_platdata(struct udevice *bus);
+int designware_i2c_of_to_plat(struct udevice *bus);
 
 /**
  * dw_i2c_gen_speed_config() - Calculate config info from requested speed
diff --git a/drivers/i2c/designware_i2c_pci.c b/drivers/i2c/designware_i2c_pci.c
index 6e7b6a2c063..18eef625f0f 100644
--- a/drivers/i2c/designware_i2c_pci.c
+++ b/drivers/i2c/designware_i2c_pci.c
@@ -34,7 +34,7 @@ static struct dw_scl_sda_cfg byt_config = {
 /* Have a weak function for now - possibly should be a new uclass */
 __weak void lpss_reset_release(void *regs);
 
-static int designware_i2c_pci_ofdata_to_platdata(struct udevice *dev)
+static int designware_i2c_pci_of_to_plat(struct udevice *dev)
 {
 	struct dw_i2c *priv = dev_get_priv(dev);
 
@@ -71,7 +71,7 @@ static int designware_i2c_pci_ofdata_to_platdata(struct udevice *dev)
 	if (dev_get_driver_data(dev) == INTEL_APL)
 		priv->has_spk_cnt = true;
 
-	return designware_i2c_ofdata_to_platdata(dev);
+	return designware_i2c_of_to_plat(dev);
 }
 
 static int designware_i2c_pci_probe(struct udevice *dev)
@@ -197,7 +197,7 @@ U_BOOT_DRIVER(i2c_designware_pci) = {
 	.id	= UCLASS_I2C,
 	.of_match = designware_i2c_pci_ids,
 	.bind	= designware_i2c_pci_bind,
-	.ofdata_to_platdata	= designware_i2c_pci_ofdata_to_platdata,
+	.of_to_plat	= designware_i2c_pci_of_to_plat,
 	.probe	= designware_i2c_pci_probe,
 	.priv_auto	= sizeof(struct dw_i2c),
 	.remove = designware_i2c_remove,
diff --git a/drivers/i2c/exynos_hs_i2c.c b/drivers/i2c/exynos_hs_i2c.c
index da8011029dd..879ddc67b69 100644
--- a/drivers/i2c/exynos_hs_i2c.c
+++ b/drivers/i2c/exynos_hs_i2c.c
@@ -517,7 +517,7 @@ static int s3c24x0_i2c_probe(struct udevice *dev, uint chip, uint chip_flags)
 	return ret != I2C_OK;
 }
 
-static int s3c_i2c_ofdata_to_platdata(struct udevice *dev)
+static int s3c_i2c_of_to_plat(struct udevice *dev)
 {
 	const void *blob = gd->fdt_blob;
 	struct s3c24x0_i2c_bus *i2c_bus = dev_get_priv(dev);
@@ -557,7 +557,7 @@ U_BOOT_DRIVER(hs_i2c) = {
 	.name	= "i2c_s3c_hs",
 	.id	= UCLASS_I2C,
 	.of_match = exynos_hs_i2c_ids,
-	.ofdata_to_platdata = s3c_i2c_ofdata_to_platdata,
+	.of_to_plat = s3c_i2c_of_to_plat,
 	.priv_auto	= sizeof(struct s3c24x0_i2c_bus),
 	.ops	= &exynos_hs_i2c_ops,
 };
diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index f55b4751977..875d30762e3 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -573,7 +573,7 @@ static int fsl_i2c_set_bus_speed(struct udevice *bus, uint speed)
 	return __i2c_set_bus_speed(dev->base, speed, dev->i2c_clk);
 }
 
-static int fsl_i2c_ofdata_to_platdata(struct udevice *bus)
+static int fsl_i2c_of_to_plat(struct udevice *bus)
 {
 	struct fsl_i2c_dev *dev = dev_get_priv(bus);
 	struct clk clock;
@@ -649,7 +649,7 @@ U_BOOT_DRIVER(i2c_fsl) = {
 	.id = UCLASS_I2C,
 	.of_match = fsl_i2c_ids,
 	.probe = fsl_i2c_probe,
-	.ofdata_to_platdata = fsl_i2c_ofdata_to_platdata,
+	.of_to_plat = fsl_i2c_of_to_plat,
 	.priv_auto	= sizeof(struct fsl_i2c_dev),
 	.ops = &fsl_i2c_ops,
 };
diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c
index 2cf22330e0b..db3c04fa6e7 100644
--- a/drivers/i2c/i2c-cdns.c
+++ b/drivers/i2c/i2c-cdns.c
@@ -460,7 +460,7 @@ static int cdns_i2c_xfer(struct udevice *dev, struct i2c_msg *msg,
 	return ret;
 }
 
-static int cdns_i2c_ofdata_to_platdata(struct udevice *dev)
+static int cdns_i2c_of_to_plat(struct udevice *dev)
 {
 	struct i2c_cdns_bus *i2c_bus = dev_get_priv(dev);
 	struct cdns_i2c_platform_data *pdata =
@@ -503,7 +503,7 @@ U_BOOT_DRIVER(cdns_i2c) = {
 	.name = "i2c_cdns",
 	.id = UCLASS_I2C,
 	.of_match = cdns_i2c_of_match,
-	.ofdata_to_platdata = cdns_i2c_ofdata_to_platdata,
+	.of_to_plat = cdns_i2c_of_to_plat,
 	.priv_auto	= sizeof(struct i2c_cdns_bus),
 	.ops = &cdns_i2c_ops,
 };
diff --git a/drivers/i2c/i2c-cortina.c b/drivers/i2c/i2c-cortina.c
index 420dfdbab94..960ae8c700f 100644
--- a/drivers/i2c/i2c-cortina.c
+++ b/drivers/i2c/i2c-cortina.c
@@ -322,7 +322,7 @@ static int ca_i2c_probe(struct udevice *bus)
 	return 0;
 }
 
-static int ca_i2c_ofdata_to_platdata(struct udevice *bus)
+static int ca_i2c_of_to_plat(struct udevice *bus)
 {
 	struct ca_i2c *priv = dev_get_priv(bus);
 
@@ -339,7 +339,7 @@ U_BOOT_DRIVER(i2c_cortina) = {
 	.name	= "i2c_cortina",
 	.id	= UCLASS_I2C,
 	.of_match = ca_i2c_ids,
-	.ofdata_to_platdata = ca_i2c_ofdata_to_platdata,
+	.of_to_plat = ca_i2c_of_to_plat,
 	.probe	= ca_i2c_probe,
 	.priv_auto	= sizeof(struct ca_i2c),
 	.ops	= &ca_i2c_ops,
diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c
index 0f363da4188..387f00b2cde 100644
--- a/drivers/i2c/i2c-gpio.c
+++ b/drivers/i2c/i2c-gpio.c
@@ -329,7 +329,7 @@ static int i2c_gpio_drv_probe(struct udevice *dev)
 	return 0;
 }
 
-static int i2c_gpio_ofdata_to_platdata(struct udevice *dev)
+static int i2c_gpio_of_to_plat(struct udevice *dev)
 {
 	struct i2c_gpio_bus *bus = dev_get_priv(dev);
 	int ret;
@@ -371,7 +371,7 @@ U_BOOT_DRIVER(i2c_gpio) = {
 	.id	= UCLASS_I2C,
 	.of_match = i2c_gpio_ids,
 	.probe	= i2c_gpio_drv_probe,
-	.ofdata_to_platdata = i2c_gpio_ofdata_to_platdata,
+	.of_to_plat = i2c_gpio_of_to_plat,
 	.priv_auto	= sizeof(struct i2c_gpio_bus),
 	.ops	= &i2c_gpio_ops,
 };
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c
index 58172f787b6..5930c6bea34 100644
--- a/drivers/i2c/i2c-uclass.c
+++ b/drivers/i2c/i2c-uclass.c
@@ -617,7 +617,7 @@ int i2c_deblock(struct udevice *bus)
 }
 
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
-int i2c_chip_ofdata_to_platdata(struct udevice *dev, struct dm_i2c_chip *chip)
+int i2c_chip_of_to_plat(struct udevice *dev, struct dm_i2c_chip *chip)
 {
 	int addr;
 
@@ -680,7 +680,7 @@ static int i2c_child_post_bind(struct udevice *dev)
 
 	if (!dev_of_valid(dev))
 		return 0;
-	return i2c_chip_ofdata_to_platdata(dev, plat);
+	return i2c_chip_of_to_plat(dev, plat);
 #else
 	return 0;
 #endif
@@ -759,7 +759,7 @@ U_BOOT_DRIVER(i2c_generic_chip_drv) = {
 	.id		= UCLASS_I2C_GENERIC,
 	.of_match	= generic_chip_i2c_ids,
 #if CONFIG_IS_ENABLED(ACPIGEN)
-	.ofdata_to_platdata	= acpi_i2c_ofdata_to_platdata,
+	.of_to_plat	= acpi_i2c_of_to_plat,
 	.priv_auto	= sizeof(struct acpi_i2c_priv),
 #endif
 	ACPI_OPS_PTR(&acpi_i2c_ops)
diff --git a/drivers/i2c/iproc_i2c.c b/drivers/i2c/iproc_i2c.c
index 20e25957330..83301bbf1b3 100644
--- a/drivers/i2c/iproc_i2c.c
+++ b/drivers/i2c/iproc_i2c.c
@@ -672,7 +672,7 @@ static int iproc_i2c_probe(struct udevice *bus)
 	return iproc_i2c_init(bus);
 }
 
-static int iproc_i2c_ofdata_to_platdata(struct udevice *bus)
+static int iproc_i2c_of_to_plat(struct udevice *bus)
 {
 	struct iproc_i2c *bus_prvdata = dev_get_priv(bus);
 	int node = dev_of_offset(bus);
@@ -705,7 +705,7 @@ U_BOOT_DRIVER(iproc_i2c) = {
 	.name	= "iproc_i2c",
 	.id	= UCLASS_I2C,
 	.of_match = iproc_i2c_ids,
-	.ofdata_to_platdata = iproc_i2c_ofdata_to_platdata,
+	.of_to_plat = iproc_i2c_of_to_plat,
 	.probe	= iproc_i2c_probe,
 	.priv_auto	= sizeof(struct iproc_i2c),
 	.ops	= &iproc_i2c_ops,
diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c
index 06efe846765..d21a84c4fa8 100644
--- a/drivers/i2c/muxes/pca954x.c
+++ b/drivers/i2c/muxes/pca954x.c
@@ -108,7 +108,7 @@ static const struct udevice_id pca954x_ids[] = {
 	{ }
 };
 
-static int pca954x_ofdata_to_platdata(struct udevice *dev)
+static int pca954x_of_to_plat(struct udevice *dev)
 {
 	struct pca954x_priv *priv = dev_get_priv(dev);
 	const struct chip_desc *chip = &chips[dev_get_driver_data(dev)];
@@ -171,6 +171,6 @@ U_BOOT_DRIVER(pca954x) = {
 	.probe = pca954x_probe,
 	.remove = pca954x_remove,
 	.ops = &pca954x_ops,
-	.ofdata_to_platdata = pca954x_ofdata_to_platdata,
+	.of_to_plat = pca954x_of_to_plat,
 	.priv_auto	= sizeof(struct pca954x_priv),
 };
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index d29bd78a7a0..10224405929 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -794,7 +794,7 @@ static int mvtwsi_i2c_set_bus_speed(struct udevice *bus, uint speed)
 	return 0;
 }
 
-static int mvtwsi_i2c_ofdata_to_platdata(struct udevice *bus)
+static int mvtwsi_i2c_of_to_plat(struct udevice *bus)
 {
 	struct mvtwsi_i2c_dev *dev = dev_get_priv(bus);
 
@@ -887,7 +887,7 @@ U_BOOT_DRIVER(i2c_mvtwsi) = {
 	.of_match = mvtwsi_i2c_ids,
 	.bind = mvtwsi_i2c_bind,
 	.probe = mvtwsi_i2c_probe,
-	.ofdata_to_platdata = mvtwsi_i2c_ofdata_to_platdata,
+	.of_to_plat = mvtwsi_i2c_of_to_plat,
 	.priv_auto	= sizeof(struct mvtwsi_i2c_dev),
 	.ops = &mvtwsi_i2c_ops,
 };
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index 9d05a1f7021..322d72132b8 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -1063,7 +1063,7 @@ static int omap_i2c_probe(struct udevice *bus)
 }
 
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
-static int omap_i2c_ofdata_to_platdata(struct udevice *bus)
+static int omap_i2c_of_to_plat(struct udevice *bus)
 {
 	struct omap_i2c_platdata *plat = dev_get_plat(bus);
 
@@ -1093,7 +1093,7 @@ U_BOOT_DRIVER(i2c_omap) = {
 	.id	= UCLASS_I2C,
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = omap_i2c_ids,
-	.ofdata_to_platdata = omap_i2c_ofdata_to_platdata,
+	.of_to_plat = omap_i2c_of_to_plat,
 	.plat_auto	= sizeof(struct omap_i2c_platdata),
 #endif
 	.probe	= omap_i2c_probe,
diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c
index e9717e530c3..704bafe2389 100644
--- a/drivers/i2c/rk_i2c.c
+++ b/drivers/i2c/rk_i2c.c
@@ -375,7 +375,7 @@ int rockchip_i2c_set_bus_speed(struct udevice *bus, unsigned int speed)
 	return 0;
 }
 
-static int rockchip_i2c_ofdata_to_platdata(struct udevice *bus)
+static int rockchip_i2c_of_to_plat(struct udevice *bus)
 {
 	struct rk_i2c *priv = dev_get_priv(bus);
 	int ret;
@@ -489,7 +489,7 @@ U_BOOT_DRIVER(rockchip_rk3066_i2c) = {
 	.name	= "rockchip_rk3066_i2c",
 	.id	= UCLASS_I2C,
 	.of_match = rockchip_i2c_ids,
-	.ofdata_to_platdata = rockchip_i2c_ofdata_to_platdata,
+	.of_to_plat = rockchip_i2c_of_to_plat,
 	.probe	= rockchip_i2c_probe,
 	.priv_auto	= sizeof(struct rk_i2c),
 	.ops	= &rockchip_i2c_ops,
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c
index b4b8e6b1b65..0c8915605db 100644
--- a/drivers/i2c/s3c24x0_i2c.c
+++ b/drivers/i2c/s3c24x0_i2c.c
@@ -302,7 +302,7 @@ static int s3c24x0_i2c_xfer(struct udevice *dev, struct i2c_msg *msg,
 	return ret ? -EREMOTEIO : 0;
 }
 
-static int s3c_i2c_ofdata_to_platdata(struct udevice *dev)
+static int s3c_i2c_of_to_plat(struct udevice *dev)
 {
 	const void *blob = gd->fdt_blob;
 	struct s3c24x0_i2c_bus *i2c_bus = dev_get_priv(dev);
@@ -342,7 +342,7 @@ U_BOOT_DRIVER(i2c_s3c) = {
 	.name	= "i2c_s3c",
 	.id	= UCLASS_I2C,
 	.of_match = s3c_i2c_ids,
-	.ofdata_to_platdata = s3c_i2c_ofdata_to_platdata,
+	.of_to_plat = s3c_i2c_of_to_plat,
 	.priv_auto	= sizeof(struct s3c24x0_i2c_bus),
 	.ops	= &s3c_i2c_ops,
 };
diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
index 483d83409f7..6553bdc6106 100644
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@@ -901,7 +901,7 @@ clk_free:
 	return ret;
 }
 
-static int stm32_ofdata_to_platdata(struct udevice *dev)
+static int stm32_of_to_plat(struct udevice *dev)
 {
 	struct stm32_i2c_priv *i2c_priv = dev_get_priv(dev);
 	u32 rise_time, fall_time;
@@ -953,7 +953,7 @@ U_BOOT_DRIVER(stm32f7_i2c) = {
 	.name = "stm32f7-i2c",
 	.id = UCLASS_I2C,
 	.of_match = stm32_i2c_of_match,
-	.ofdata_to_platdata = stm32_ofdata_to_platdata,
+	.of_to_plat = stm32_of_to_plat,
 	.probe = stm32_i2c_probe,
 	.priv_auto	= sizeof(struct stm32_i2c_priv),
 	.ops = &stm32_i2c_ops,
diff --git a/drivers/led/led_cortina.c b/drivers/led/led_cortina.c
index c705eba61bd..971bbcf987c 100644
--- a/drivers/led/led_cortina.c
+++ b/drivers/led/led_cortina.c
@@ -130,7 +130,7 @@ static const struct led_ops cortina_led_ops = {
 	.set_state = cortina_led_set_state,
 };
 
-static int ca_led_ofdata_to_platdata(struct udevice *dev)
+static int ca_led_of_to_plat(struct udevice *dev)
 {
 	struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);
 
@@ -289,7 +289,7 @@ U_BOOT_DRIVER(cortina_led) = {
 	.name = "ca-leds",
 	.id = UCLASS_LED,
 	.of_match = ca_led_ids,
-	.ofdata_to_platdata = ca_led_ofdata_to_platdata,
+	.of_to_plat = ca_led_of_to_plat,
 	.bind = cortina_led_bind,
 	.probe = cortina_led_probe,
 	.plat_auto	= sizeof(struct cortina_led_platdata),
diff --git a/drivers/misc/altera_sysid.c b/drivers/misc/altera_sysid.c
index 31684d7e810..091f055ec01 100644
--- a/drivers/misc/altera_sysid.c
+++ b/drivers/misc/altera_sysid.c
@@ -69,7 +69,7 @@ static int altera_sysid_read(struct udevice *dev,
 	return 0;
 }
 
-static int altera_sysid_ofdata_to_platdata(struct udevice *dev)
+static int altera_sysid_of_to_plat(struct udevice *dev)
 {
 	struct altera_sysid_platdata *plat = dev_get_plat(dev);
 
@@ -93,7 +93,7 @@ U_BOOT_DRIVER(altera_sysid) = {
 	.name	= "altera_sysid",
 	.id	= UCLASS_MISC,
 	.of_match = altera_sysid_ids,
-	.ofdata_to_platdata = altera_sysid_ofdata_to_platdata,
+	.of_to_plat = altera_sysid_of_to_plat,
 	.plat_auto	= sizeof(struct altera_sysid_platdata),
 	.ops	= &altera_sysid_ops,
 };
diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c
index bacd47e60f1..90f9cd246a0 100644
--- a/drivers/misc/atsha204a-i2c.c
+++ b/drivers/misc/atsha204a-i2c.c
@@ -382,7 +382,7 @@ int atsha204a_get_random(struct udevice *dev, u8 *buffer, size_t max)
 	return 0;
 }
 
-static int atsha204a_ofdata_to_platdata(struct udevice *dev)
+static int atsha204a_of_to_plat(struct udevice *dev)
 {
 	fdt_addr_t *priv = dev_get_priv(dev);
 	fdt_addr_t addr;
@@ -406,6 +406,6 @@ U_BOOT_DRIVER(atsha204) = {
 	.name			= "atsha204",
 	.id			= UCLASS_MISC,
 	.of_match		= atsha204a_ids,
-	.ofdata_to_platdata	= atsha204a_ofdata_to_platdata,
+	.of_to_plat	= atsha204a_of_to_plat,
 	.priv_auto	= sizeof(fdt_addr_t),
 };
diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c
index b149a27b082..c228e84fa1f 100644
--- a/drivers/misc/fs_loader.c
+++ b/drivers/misc/fs_loader.c
@@ -219,7 +219,7 @@ int request_firmware_into_buf(struct udevice *dev,
 	return ret;
 }
 
-static int fs_loader_ofdata_to_platdata(struct udevice *dev)
+static int fs_loader_of_to_plat(struct udevice *dev)
 {
 	u32 phandlepart[2];
 
@@ -284,7 +284,7 @@ U_BOOT_DRIVER(fs_loader) = {
 	.id			= UCLASS_FS_FIRMWARE_LOADER,
 	.of_match		= fs_loader_ids,
 	.probe			= fs_loader_probe,
-	.ofdata_to_platdata	= fs_loader_ofdata_to_platdata,
+	.of_to_plat	= fs_loader_of_to_plat,
 	.plat_auto	= sizeof(struct device_platdata),
 	.priv_auto	= sizeof(struct firmware),
 };
diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c
index 3499114394d..9ffd28f597d 100644
--- a/drivers/misc/i2c_eeprom.c
+++ b/drivers/misc/i2c_eeprom.c
@@ -93,7 +93,7 @@ static const struct i2c_eeprom_ops i2c_eeprom_std_ops = {
 	.size	= i2c_eeprom_std_size,
 };
 
-static int i2c_eeprom_std_ofdata_to_platdata(struct udevice *dev)
+static int i2c_eeprom_std_of_to_plat(struct udevice *dev)
 {
 	struct i2c_eeprom *priv = dev_get_priv(dev);
 	struct i2c_eeprom_drv_data *data =
@@ -283,7 +283,7 @@ U_BOOT_DRIVER(i2c_eeprom_std) = {
 	.of_match		= i2c_eeprom_std_ids,
 	.bind			= i2c_eeprom_std_bind,
 	.probe			= i2c_eeprom_std_probe,
-	.ofdata_to_platdata	= i2c_eeprom_std_ofdata_to_platdata,
+	.of_to_plat	= i2c_eeprom_std_of_to_plat,
 	.priv_auto	= sizeof(struct i2c_eeprom),
 	.ops			= &i2c_eeprom_std_ops,
 };
@@ -298,7 +298,7 @@ static int i2c_eeprom_partition_probe(struct udevice *dev)
 	return 0;
 }
 
-static int i2c_eeprom_partition_ofdata_to_platdata(struct udevice *dev)
+static int i2c_eeprom_partition_of_to_plat(struct udevice *dev)
 {
 	struct i2c_eeprom_partition *priv = dev_get_priv(dev);
 	u32 reg[2];
@@ -365,7 +365,7 @@ U_BOOT_DRIVER(i2c_eeprom_partition) = {
 	.name			= "i2c_eeprom_partition",
 	.id			= UCLASS_I2C_EEPROM,
 	.probe			= i2c_eeprom_partition_probe,
-	.ofdata_to_platdata	= i2c_eeprom_partition_ofdata_to_platdata,
+	.of_to_plat	= i2c_eeprom_partition_of_to_plat,
 	.priv_auto	= sizeof(struct i2c_eeprom_partition),
 	.ops			= &i2c_eeprom_partition_ops,
 };
diff --git a/drivers/misc/i2c_eeprom_emul.c b/drivers/misc/i2c_eeprom_emul.c
index 92b2f277a52..85b127c406c 100644
--- a/drivers/misc/i2c_eeprom_emul.c
+++ b/drivers/misc/i2c_eeprom_emul.c
@@ -149,7 +149,7 @@ struct dm_i2c_ops sandbox_i2c_emul_ops = {
 	.xfer = sandbox_i2c_eeprom_xfer,
 };
 
-static int sandbox_i2c_eeprom_ofdata_to_platdata(struct udevice *dev)
+static int sandbox_i2c_eeprom_of_to_plat(struct udevice *dev)
 {
 	struct sandbox_i2c_flash_plat_data *plat = dev_get_plat(dev);
 
@@ -197,7 +197,7 @@ U_BOOT_DRIVER(sandbox_i2c_emul) = {
 	.name		= "sandbox_i2c_eeprom_emul",
 	.id		= UCLASS_I2C_EMUL,
 	.of_match	= sandbox_i2c_ids,
-	.ofdata_to_platdata = sandbox_i2c_eeprom_ofdata_to_platdata,
+	.of_to_plat = sandbox_i2c_eeprom_of_to_plat,
 	.probe		= sandbox_i2c_eeprom_probe,
 	.remove		= sandbox_i2c_eeprom_remove,
 	.priv_auto	= sizeof(struct sandbox_i2c_flash),
diff --git a/drivers/misc/microchip_flexcom.c b/drivers/misc/microchip_flexcom.c
index a95d9cbaf96..d0ef2ef96ca 100644
--- a/drivers/misc/microchip_flexcom.c
+++ b/drivers/misc/microchip_flexcom.c
@@ -21,7 +21,7 @@ struct microchip_flexcom_platdata {
 	u32 flexcom_mode;
 };
 
-static int microchip_flexcom_ofdata_to_platdata(struct udevice *dev)
+static int microchip_flexcom_of_to_plat(struct udevice *dev)
 {
 	struct microchip_flexcom_platdata *plat = dev_get_plat(dev);
 	int ret;
@@ -61,6 +61,6 @@ U_BOOT_DRIVER(microchip_flexcom) = {
 	.name	= "microchip_flexcom",
 	.id	= UCLASS_MISC,
 	.of_match = microchip_flexcom_ids,
-	.ofdata_to_platdata = microchip_flexcom_ofdata_to_platdata,
+	.of_to_plat = microchip_flexcom_of_to_plat,
 	.plat_auto	= sizeof(struct microchip_flexcom_platdata),
 };
diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c
index 4659d4eb87f..08e30bae06c 100644
--- a/drivers/misc/rockchip-efuse.c
+++ b/drivers/misc/rockchip-efuse.c
@@ -137,7 +137,7 @@ static const struct misc_ops rockchip_efuse_ops = {
 	.read = rockchip_efuse_read,
 };
 
-static int rockchip_efuse_ofdata_to_platdata(struct udevice *dev)
+static int rockchip_efuse_of_to_plat(struct udevice *dev)
 {
 	struct rockchip_efuse_platdata *plat = dev_get_plat(dev);
 
@@ -154,7 +154,7 @@ U_BOOT_DRIVER(rockchip_efuse) = {
 	.name = "rockchip_efuse",
 	.id = UCLASS_MISC,
 	.of_match = rockchip_efuse_ids,
-	.ofdata_to_platdata = rockchip_efuse_ofdata_to_platdata,
+	.of_to_plat = rockchip_efuse_of_to_plat,
 	.plat_auto	= sizeof(struct rockchip_efuse_platdata),
 	.ops = &rockchip_efuse_ops,
 };
diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c
index b56eb663286..9707750355a 100644
--- a/drivers/misc/rockchip-otp.c
+++ b/drivers/misc/rockchip-otp.c
@@ -145,7 +145,7 @@ static const struct misc_ops rockchip_otp_ops = {
 	.read = rockchip_otp_read,
 };
 
-static int rockchip_otp_ofdata_to_platdata(struct udevice *dev)
+static int rockchip_otp_of_to_plat(struct udevice *dev)
 {
 	struct rockchip_otp_platdata *otp = dev_get_plat(dev);
 
@@ -171,6 +171,6 @@ U_BOOT_DRIVER(rockchip_otp) = {
 	.id = UCLASS_MISC,
 	.of_match = rockchip_otp_ids,
 	.ops = &rockchip_otp_ops,
-	.ofdata_to_platdata = rockchip_otp_ofdata_to_platdata,
+	.of_to_plat = rockchip_otp_of_to_plat,
 	.plat_auto	= sizeof(struct rockchip_otp_platdata),
 };
diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c
index 1f0bd1dce0e..e1f59716426 100644
--- a/drivers/misc/sifive-otp.c
+++ b/drivers/misc/sifive-otp.c
@@ -239,7 +239,7 @@ static int sifive_otp_write(struct udevice *dev, int offset,
 	return size;
 }
 
-static int sifive_otp_ofdata_to_platdata(struct udevice *dev)
+static int sifive_otp_of_to_plat(struct udevice *dev)
 {
 	struct sifive_otp_platdata *plat = dev_get_plat(dev);
 	int ret;
@@ -269,7 +269,7 @@ U_BOOT_DRIVER(sifive_otp) = {
 	.name = "sifive_otp",
 	.id = UCLASS_MISC,
 	.of_match = sifive_otp_ids,
-	.ofdata_to_platdata = sifive_otp_ofdata_to_platdata,
+	.of_to_plat = sifive_otp_of_to_plat,
 	.plat_auto	= sizeof(struct sifive_otp_platdata),
 	.ops = &sifive_otp_ops,
 };
diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c
index 1fca3e6dd9d..baa935e0d5b 100644
--- a/drivers/mmc/am654_sdhci.c
+++ b/drivers/mmc/am654_sdhci.c
@@ -408,7 +408,7 @@ static int am654_sdhci_probe(struct udevice *dev)
 	return 0;
 }
 
-static int am654_sdhci_ofdata_to_platdata(struct udevice *dev)
+static int am654_sdhci_of_to_plat(struct udevice *dev)
 {
 	struct am654_sdhci_plat *plat = dev_get_plat(dev);
 	struct sdhci_host *host = dev_get_priv(dev);
@@ -490,7 +490,7 @@ U_BOOT_DRIVER(am654_sdhci_drv) = {
 	.name		= "am654_sdhci",
 	.id		= UCLASS_MMC,
 	.of_match	= am654_sdhci_ids,
-	.ofdata_to_platdata = am654_sdhci_ofdata_to_platdata,
+	.of_to_plat = am654_sdhci_of_to_plat,
 	.ops		= &sdhci_ops,
 	.bind		= am654_sdhci_bind,
 	.probe		= am654_sdhci_probe,
diff --git a/drivers/mmc/arm_pl180_mmci.c b/drivers/mmc/arm_pl180_mmci.c
index 7dc23ca2266..fe406fe4ad7 100644
--- a/drivers/mmc/arm_pl180_mmci.c
+++ b/drivers/mmc/arm_pl180_mmci.c
@@ -523,7 +523,7 @@ static const struct dm_mmc_ops arm_pl180_dm_mmc_ops = {
 	.get_cd = dm_mmc_getcd,
 };
 
-static int arm_pl180_mmc_ofdata_to_platdata(struct udevice *dev)
+static int arm_pl180_mmc_of_to_plat(struct udevice *dev)
 {
 	struct pl180_mmc_host *host = dev->priv;
 	fdt_addr_t addr;
@@ -549,7 +549,7 @@ U_BOOT_DRIVER(arm_pl180_mmc) = {
 	.of_match = arm_pl180_mmc_match,
 	.ops = &arm_pl180_dm_mmc_ops,
 	.probe = arm_pl180_mmc_probe,
-	.ofdata_to_platdata = arm_pl180_mmc_ofdata_to_platdata,
+	.of_to_plat = arm_pl180_mmc_of_to_plat,
 	.bind = arm_pl180_mmc_bind,
 	.priv_auto	= sizeof(struct pl180_mmc_host),
 	.plat_auto	= sizeof(struct arm_pl180_mmc_plat),
diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c
index 5b08d09912d..fad2ff5aaf6 100644
--- a/drivers/mmc/ca_dw_mmc.c
+++ b/drivers/mmc/ca_dw_mmc.c
@@ -87,7 +87,7 @@ unsigned int ca_dwmci_get_mmc_clock(struct dwmci_host *host, uint freq)
 	return SD_SCLK_MAX / clk_div / (host->div + 1);
 }
 
-static int ca_dwmmc_ofdata_to_platdata(struct udevice *dev)
+static int ca_dwmmc_of_to_plat(struct udevice *dev)
 {
 	struct ca_dwmmc_priv_data *priv = dev_get_priv(dev);
 	struct dwmci_host *host = &priv->host;
@@ -162,7 +162,7 @@ U_BOOT_DRIVER(ca_dwmmc_drv) = {
 	.name		= "cortina_dwmmc",
 	.id		= UCLASS_MMC,
 	.of_match	= ca_dwmmc_ids,
-	.ofdata_to_platdata = ca_dwmmc_ofdata_to_platdata,
+	.of_to_plat = ca_dwmmc_of_to_plat,
 	.bind		= ca_dwmmc_bind,
 	.ops		= &ca_dwmci_dm_ops,
 	.probe		= ca_dwmmc_probe,
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index 975a6bec061..05ca3612809 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -501,7 +501,7 @@ static int davinci_mmc_bind(struct udevice *dev)
 }
 
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-static int davinci_mmc_ofdata_to_platdata(struct udevice *dev)
+static int davinci_mmc_of_to_plat(struct udevice *dev)
 {
 	struct davinci_mmc_plat *plat = dev_get_plat(dev);
 	struct mmc_config *cfg = &plat->cfg;
@@ -528,7 +528,7 @@ U_BOOT_DRIVER(ti_da830_mmc) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.of_match	= davinci_mmc_ids,
 	.plat_auto	= sizeof(struct davinci_mmc_plat),
-	.ofdata_to_platdata = davinci_mmc_ofdata_to_platdata,
+	.of_to_plat = davinci_mmc_of_to_plat,
 #endif
 #if CONFIG_BLK
 	.bind		= davinci_mmc_bind,
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 1b63315eeba..34c2dceb188 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -1384,7 +1384,7 @@ __weak void init_clk_usdhc(u32 index)
 {
 }
 
-static int fsl_esdhc_ofdata_to_platdata(struct udevice *dev)
+static int fsl_esdhc_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct fsl_esdhc_priv *priv = dev_get_priv(dev);
@@ -1701,7 +1701,7 @@ U_BOOT_DRIVER(fsl_esdhc) = {
 	.name	= "fsl_esdhc",
 	.id	= UCLASS_MMC,
 	.of_match = fsl_esdhc_ids,
-	.ofdata_to_platdata = fsl_esdhc_ofdata_to_platdata,
+	.of_to_plat = fsl_esdhc_of_to_plat,
 	.ops	= &fsl_esdhc_ops,
 #if CONFIG_IS_ENABLED(BLK)
 	.bind	= fsl_esdhc_bind,
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
index 1c318742353..fa6181d85fa 100644
--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
@@ -389,7 +389,7 @@ static void ftsdc_setup_cfg(struct mmc_config *cfg, const char *name, int buswid
 	cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
 }
 
-static int ftsdc010_mmc_ofdata_to_platdata(struct udevice *dev)
+static int ftsdc010_mmc_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct ftsdc_priv *priv = dev_get_priv(dev);
@@ -473,7 +473,7 @@ U_BOOT_DRIVER(ftsdc010_mmc) = {
 	.name		= "ftsdc010_mmc",
 	.id		= UCLASS_MMC,
 	.of_match	= ftsdc010_mmc_ids,
-	.ofdata_to_platdata = ftsdc010_mmc_ofdata_to_platdata,
+	.of_to_plat = ftsdc010_mmc_of_to_plat,
 	.ops		= &dm_ftsdc010_mmc_ops,
 	.bind		= ftsdc010_mmc_bind,
 	.probe		= ftsdc010_mmc_probe,
diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c
index 5fd71b8a401..bb5d0922beb 100644
--- a/drivers/mmc/hi6220_dw_mmc.c
+++ b/drivers/mmc/hi6220_dw_mmc.c
@@ -27,7 +27,7 @@ struct hisi_mmc_data {
 	bool use_fifo;
 };
 
-static int hi6220_dwmmc_ofdata_to_platdata(struct udevice *dev)
+static int hi6220_dwmmc_of_to_plat(struct udevice *dev)
 {
 	struct hi6220_dwmmc_priv_data *priv = dev_get_priv(dev);
 	struct dwmci_host *host = &priv->host;
@@ -108,7 +108,7 @@ U_BOOT_DRIVER(hi6220_dwmmc_drv) = {
 	.name = "hi6220_dwmmc",
 	.id = UCLASS_MMC,
 	.of_match = hi6220_dwmmc_ids,
-	.ofdata_to_platdata = hi6220_dwmmc_ofdata_to_platdata,
+	.of_to_plat = hi6220_dwmmc_of_to_plat,
 	.ops = &dm_dwmci_ops,
 	.bind = hi6220_dwmmc_bind,
 	.probe = hi6220_dwmmc_probe,
diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c
index edcfbfbce96..ae3af3927db 100644
--- a/drivers/mmc/jz_mmc.c
+++ b/drivers/mmc/jz_mmc.c
@@ -443,7 +443,7 @@ static const struct dm_mmc_ops jz_msc_ops = {
 	.set_ios	= jz_mmc_dm_set_ios,
 };
 
-static int jz_mmc_ofdata_to_platdata(struct udevice *dev)
+static int jz_mmc_of_to_plat(struct udevice *dev)
 {
 	struct jz_mmc_priv *priv = dev_get_priv(dev);
 	struct jz_mmc_plat *plat = dev_get_plat(dev);
@@ -498,7 +498,7 @@ U_BOOT_DRIVER(jz_mmc_drv) = {
 	.name			= "jz_mmc",
 	.id			= UCLASS_MMC,
 	.of_match		= jz_mmc_ids,
-	.ofdata_to_platdata	= jz_mmc_ofdata_to_platdata,
+	.of_to_plat	= jz_mmc_of_to_plat,
 	.bind			= jz_mmc_bind,
 	.probe			= jz_mmc_probe,
 	.priv_auto	= sizeof(struct jz_mmc_priv),
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index ab10d7c5093..518e24e0410 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -241,7 +241,7 @@ static const struct dm_mmc_ops meson_dm_mmc_ops = {
 	.set_ios = meson_dm_mmc_set_ios,
 };
 
-static int meson_mmc_ofdata_to_platdata(struct udevice *dev)
+static int meson_mmc_of_to_plat(struct udevice *dev)
 {
 	struct meson_mmc_platdata *pdata = dev_get_plat(dev);
 	fdt_addr_t addr;
@@ -339,7 +339,7 @@ U_BOOT_DRIVER(meson_mmc) = {
 	.ops = &meson_dm_mmc_ops,
 	.probe = meson_mmc_probe,
 	.bind = meson_mmc_bind,
-	.ofdata_to_platdata = meson_mmc_ofdata_to_platdata,
+	.of_to_plat = meson_mmc_of_to_plat,
 	.plat_auto	= sizeof(struct meson_mmc_platdata),
 };
 
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index da4cecd7604..bfbba46c5dc 100644
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -167,7 +167,7 @@ static int msm_sdc_remove(struct udevice *dev)
 	return 0;
 }
 
-static int msm_ofdata_to_platdata(struct udevice *dev)
+static int msm_of_to_plat(struct udevice *dev)
 {
 	struct udevice *parent = dev->parent;
 	struct msm_sdhc *priv = dev_get_priv(dev);
@@ -203,7 +203,7 @@ U_BOOT_DRIVER(msm_sdc_drv) = {
 	.name		= "msm_sdc",
 	.id		= UCLASS_MMC,
 	.of_match	= msm_mmc_ids,
-	.ofdata_to_platdata = msm_ofdata_to_platdata,
+	.of_to_plat = msm_of_to_plat,
 	.ops		= &sdhci_ops,
 	.bind		= msm_sdc_bind,
 	.probe		= msm_sdc_probe,
diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c
index cc9d68546f8..95dc9daee96 100644
--- a/drivers/mmc/mtk-sd.c
+++ b/drivers/mmc/mtk-sd.c
@@ -1545,7 +1545,7 @@ static int msdc_drv_probe(struct udevice *dev)
 	return 0;
 }
 
-static int msdc_ofdata_to_platdata(struct udevice *dev)
+static int msdc_of_to_plat(struct udevice *dev)
 {
 	struct msdc_plat *plat = dev_get_plat(dev);
 	struct msdc_host *host = dev_get_priv(dev);
@@ -1688,7 +1688,7 @@ U_BOOT_DRIVER(mtk_sd_drv) = {
 	.name = "mtk_sd",
 	.id = UCLASS_MMC,
 	.of_match = msdc_ids,
-	.ofdata_to_platdata = msdc_ofdata_to_platdata,
+	.of_to_plat = msdc_of_to_plat,
 	.bind = msdc_drv_bind,
 	.probe = msdc_drv_probe,
 	.ops = &msdc_ops,
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c
index dcf6c7c03f8..c96334f96b7 100644
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -666,7 +666,7 @@ static const struct dm_mmc_ops mxsmmc_ops = {
 };
 
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
-static int mxsmmc_ofdata_to_platdata(struct udevice *bus)
+static int mxsmmc_of_to_plat(struct udevice *bus)
 {
 	struct mxsmmc_platdata *plat = bus->plat;
 	u32 prop[2];
@@ -711,7 +711,7 @@ U_BOOT_DRIVER(fsl_imx23_mmc) = {
 	.id	= UCLASS_MMC,
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = mxsmmc_ids,
-	.ofdata_to_platdata = mxsmmc_ofdata_to_platdata,
+	.of_to_plat = mxsmmc_of_to_plat,
 #endif
 	.ops	= &mxsmmc_ops,
 #if CONFIG_IS_ENABLED(BLK)
diff --git a/drivers/mmc/nexell_dw_mmc.c b/drivers/mmc/nexell_dw_mmc.c
index 537be0d0d75..753c89d278c 100644
--- a/drivers/mmc/nexell_dw_mmc.c
+++ b/drivers/mmc/nexell_dw_mmc.c
@@ -139,7 +139,7 @@ static unsigned long nx_dw_mmc_set_clk(struct dwmci_host *host,
 	return rate;
 }
 
-static int nexell_dwmmc_ofdata_to_platdata(struct udevice *dev)
+static int nexell_dwmmc_of_to_plat(struct udevice *dev)
 {
 	struct nexell_dwmmc_priv *priv = dev_get_priv(dev);
 	struct dwmci_host *host = &priv->host;
@@ -228,7 +228,7 @@ U_BOOT_DRIVER(nexell_dwmmc_drv) = {
 	.name		= "nexell_dwmmc",
 	.id		= UCLASS_MMC,
 	.of_match	= nexell_dwmmc_ids,
-	.ofdata_to_platdata = nexell_dwmmc_ofdata_to_platdata,
+	.of_to_plat = nexell_dwmmc_of_to_plat,
 	.ops		= &dm_dwmci_ops,
 	.bind		= nexell_dwmmc_bind,
 	.probe		= nexell_dwmmc_probe,
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index c4e9e82b193..52f044e37a1 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -1898,7 +1898,7 @@ __weak const struct mmc_platform_fixups *platform_fixups_mmc(uint32_t addr)
 }
 #endif
 
-static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)
+static int omap_hsmmc_of_to_plat(struct udevice *dev)
 {
 	struct omap_hsmmc_plat *plat = dev_get_plat(dev);
 	struct omap_mmc_of_data *of_data = (void *)dev_get_driver_data(dev);
@@ -2028,7 +2028,7 @@ U_BOOT_DRIVER(omap_hsmmc) = {
 	.id	= UCLASS_MMC,
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = omap_hsmmc_ids,
-	.ofdata_to_platdata = omap_hsmmc_ofdata_to_platdata,
+	.of_to_plat = omap_hsmmc_of_to_plat,
 	.plat_auto	= sizeof(struct omap_hsmmc_plat),
 #endif
 #ifdef CONFIG_BLK
diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c
index 0aec3f7de74..fc09ad99e5e 100644
--- a/drivers/mmc/pci_mmc.c
+++ b/drivers/mmc/pci_mmc.c
@@ -50,7 +50,7 @@ static int pci_mmc_probe(struct udevice *dev)
 	return sdhci_probe(dev);
 }
 
-static int pci_mmc_ofdata_to_platdata(struct udevice *dev)
+static int pci_mmc_of_to_plat(struct udevice *dev)
 {
 	struct pci_mmc_priv *priv = dev_get_priv(dev);
 
@@ -129,7 +129,7 @@ U_BOOT_DRIVER(pci_mmc) = {
 	.id	= UCLASS_MMC,
 	.of_match = pci_mmc_match,
 	.bind	= pci_mmc_bind,
-	.ofdata_to_platdata	= pci_mmc_ofdata_to_platdata,
+	.of_to_plat	= pci_mmc_of_to_plat,
 	.probe	= pci_mmc_probe,
 	.ops	= &sdhci_ops,
 	.priv_auto	= sizeof(struct pci_mmc_priv),
diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c
index 51a6b4dd1b6..75db81ba4ca 100644
--- a/drivers/mmc/rockchip_dw_mmc.c
+++ b/drivers/mmc/rockchip_dw_mmc.c
@@ -50,7 +50,7 @@ static uint rockchip_dwmmc_get_mmc_clk(struct dwmci_host *host, uint freq)
 	return freq;
 }
 
-static int rockchip_dwmmc_ofdata_to_platdata(struct udevice *dev)
+static int rockchip_dwmmc_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct rockchip_dwmmc_priv *priv = dev_get_priv(dev);
@@ -172,7 +172,7 @@ U_BOOT_DRIVER(rockchip_rk3288_dw_mshc) = {
 	.name		= "rockchip_rk3288_dw_mshc",
 	.id		= UCLASS_MMC,
 	.of_match	= rockchip_dwmmc_ids,
-	.ofdata_to_platdata = rockchip_dwmmc_ofdata_to_platdata,
+	.of_to_plat = rockchip_dwmmc_of_to_plat,
 	.ops		= &dm_dwmci_ops,
 	.bind		= rockchip_dwmmc_bind,
 	.probe		= rockchip_dwmmc_probe,
diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c
index 939b2344f94..d95f8b2a15b 100644
--- a/drivers/mmc/rockchip_sdhci.c
+++ b/drivers/mmc/rockchip_sdhci.c
@@ -81,7 +81,7 @@ static int arasan_sdhci_probe(struct udevice *dev)
 	return sdhci_probe(dev);
 }
 
-static int arasan_sdhci_ofdata_to_platdata(struct udevice *dev)
+static int arasan_sdhci_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct sdhci_host *host = dev_get_priv(dev);
@@ -110,7 +110,7 @@ U_BOOT_DRIVER(arasan_sdhci_drv) = {
 	.name		= "rockchip_rk3399_sdhci_5_1",
 	.id		= UCLASS_MMC,
 	.of_match	= arasan_sdhci_ids,
-	.ofdata_to_platdata = arasan_sdhci_ofdata_to_platdata,
+	.of_to_plat = arasan_sdhci_of_to_plat,
 	.ops		= &sdhci_ops,
 	.bind		= rockchip_sdhci_bind,
 	.probe		= arasan_sdhci_probe,
diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c
index ad274f5af72..50a8805e736 100644
--- a/drivers/mmc/snps_dw_mmc.c
+++ b/drivers/mmc/snps_dw_mmc.c
@@ -76,7 +76,7 @@ clk_err:
 	return ret;
 }
 
-static int snps_dwmmc_ofdata_to_platdata(struct udevice *dev)
+static int snps_dwmmc_of_to_plat(struct udevice *dev)
 {
 	struct snps_dwmci_priv_data *priv = dev_get_priv(dev);
 	struct dwmci_host *host = &priv->host;
@@ -191,7 +191,7 @@ U_BOOT_DRIVER(snps_dwmmc_drv) = {
 	.name				= "snps_dw_mmc",
 	.id				= UCLASS_MMC,
 	.of_match			= snps_dwmmc_ids,
-	.ofdata_to_platdata		= snps_dwmmc_ofdata_to_platdata,
+	.of_to_plat		= snps_dwmmc_of_to_plat,
 	.ops				= &snps_dwmci_dm_ops,
 	.bind				= snps_dwmmc_bind,
 	.probe				= snps_dwmmc_probe,
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c
index 84f8b8db2b4..dc008c5e2f0 100644
--- a/drivers/mmc/socfpga_dw_mmc.c
+++ b/drivers/mmc/socfpga_dw_mmc.c
@@ -95,7 +95,7 @@ static int socfpga_dwmmc_get_clk_rate(struct udevice *dev)
 	return 0;
 }
 
-static int socfpga_dwmmc_ofdata_to_platdata(struct udevice *dev)
+static int socfpga_dwmmc_of_to_plat(struct udevice *dev)
 {
 	struct dwmci_socfpga_priv_data *priv = dev_get_priv(dev);
 	struct dwmci_host *host = &priv->host;
@@ -185,7 +185,7 @@ U_BOOT_DRIVER(socfpga_dwmmc_drv) = {
 	.name		= "socfpga_dwmmc",
 	.id		= UCLASS_MMC,
 	.of_match	= socfpga_dwmmc_ids,
-	.ofdata_to_platdata = socfpga_dwmmc_ofdata_to_platdata,
+	.of_to_plat = socfpga_dwmmc_of_to_plat,
 	.ops		= &dm_dwmci_ops,
 	.bind		= socfpga_dwmmc_bind,
 	.probe		= socfpga_dwmmc_probe,
diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c
index 4ad408a2a32..a09534255b4 100644
--- a/drivers/mmc/sti_sdhci.c
+++ b/drivers/mmc/sti_sdhci.c
@@ -111,7 +111,7 @@ static int sti_sdhci_probe(struct udevice *dev)
 	return sdhci_probe(dev);
 }
 
-static int sti_sdhci_ofdata_to_platdata(struct udevice *dev)
+static int sti_sdhci_of_to_plat(struct udevice *dev)
 {
 	struct sdhci_host *host = dev_get_priv(dev);
 
@@ -142,7 +142,7 @@ U_BOOT_DRIVER(sti_mmc) = {
 	.of_match = sti_sdhci_ids,
 	.bind = sti_sdhci_bind,
 	.ops = &sdhci_ops,
-	.ofdata_to_platdata = sti_sdhci_ofdata_to_platdata,
+	.of_to_plat = sti_sdhci_of_to_plat,
 	.probe = sti_sdhci_probe,
 	.priv_auto	= sizeof(struct sdhci_host),
 	.plat_auto	= sizeof(struct sti_sdhci_plat),
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 5062397a792..b8e833e6a3c 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -515,7 +515,7 @@ static int xenon_sdhci_probe(struct udevice *dev)
 	return ret;
 }
 
-static int xenon_sdhci_ofdata_to_platdata(struct udevice *dev)
+static int xenon_sdhci_of_to_plat(struct udevice *dev)
 {
 	struct sdhci_host *host = dev_get_priv(dev);
 	struct xenon_sdhci_priv *priv = dev_get_priv(dev);
@@ -560,7 +560,7 @@ U_BOOT_DRIVER(xenon_sdhci_drv) = {
 	.name		= "xenon_sdhci",
 	.id		= UCLASS_MMC,
 	.of_match	= xenon_sdhci_ids,
-	.ofdata_to_platdata = xenon_sdhci_ofdata_to_platdata,
+	.of_to_plat = xenon_sdhci_of_to_plat,
 	.ops		= &sdhci_ops,
 	.bind		= xenon_sdhci_bind,
 	.probe		= xenon_sdhci_probe,
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
index 29850a435bc..d9ad0ff199d 100644
--- a/drivers/mmc/zynq_sdhci.c
+++ b/drivers/mmc/zynq_sdhci.c
@@ -613,7 +613,7 @@ static int arasan_sdhci_probe(struct udevice *dev)
 	return sdhci_probe(dev);
 }
 
-static int arasan_sdhci_ofdata_to_platdata(struct udevice *dev)
+static int arasan_sdhci_of_to_plat(struct udevice *dev)
 {
 	struct arasan_sdhci_priv *priv = dev_get_priv(dev);
 
@@ -655,7 +655,7 @@ U_BOOT_DRIVER(arasan_sdhci_drv) = {
 	.name		= "arasan_sdhci",
 	.id		= UCLASS_MMC,
 	.of_match	= arasan_sdhci_ids,
-	.ofdata_to_platdata = arasan_sdhci_ofdata_to_platdata,
+	.of_to_plat = arasan_sdhci_of_to_plat,
 	.ops		= &sdhci_ops,
 	.bind		= arasan_sdhci_bind,
 	.probe		= arasan_sdhci_probe,
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
index 9a3a21f2e35..250fb4f75f0 100644
--- a/drivers/mtd/altera_qspi.c
+++ b/drivers/mtd/altera_qspi.c
@@ -346,7 +346,7 @@ static int altera_qspi_probe(struct udevice *dev)
 	return 0;
 }
 
-static int altera_qspi_ofdata_to_platdata(struct udevice *dev)
+static int altera_qspi_of_to_plat(struct udevice *dev)
 {
 	struct altera_qspi_platdata *pdata = dev_get_plat(dev);
 	void *blob = (void *)gd->fdt_blob;
@@ -400,7 +400,7 @@ U_BOOT_DRIVER(altera_qspi) = {
 	.name	= "altera_qspi",
 	.id	= UCLASS_MTD,
 	.of_match = altera_qspi_ids,
-	.ofdata_to_platdata = altera_qspi_ofdata_to_platdata,
+	.of_to_plat = altera_qspi_of_to_plat,
 	.plat_auto	= sizeof(struct altera_qspi_platdata),
 	.probe	= altera_qspi_probe,
 };
diff --git a/drivers/mtd/nand/raw/octeontx_nand.c b/drivers/mtd/nand/raw/octeontx_nand.c
index cfeca1e6880..b1ed4d910a7 100644
--- a/drivers/mtd/nand/raw/octeontx_nand.c
+++ b/drivers/mtd/nand/raw/octeontx_nand.c
@@ -2203,7 +2203,7 @@ static const struct pci_device_id octeontx_nfc_pci_id_table[] = {
 	{}
 };
 
-static int octeontx_nand_ofdata_to_platdata(struct udevice *dev)
+static int octeontx_nand_of_to_plat(struct udevice *dev)
 {
 	return 0;
 }
@@ -2217,7 +2217,7 @@ U_BOOT_DRIVER(octeontx_pci_nand) = {
 	.name	= OCTEONTX_NAND_DRIVER_NAME,
 	.id	= UCLASS_MTD,
 	.of_match = of_match_ptr(octeontx_nand_ids),
-	.ofdata_to_platdata = octeontx_nand_ofdata_to_platdata,
+	.of_to_plat = octeontx_nand_of_to_plat,
 	.probe = octeontx_pci_nand_probe,
 	.priv_auto	= sizeof(struct octeontx_nfc),
 	.remove = octeontx_pci_nand_disable,
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c
index 44fb25a482b..d59953b6e3c 100644
--- a/drivers/mtd/spi/sandbox.c
+++ b/drivers/mtd/spi/sandbox.c
@@ -498,7 +498,7 @@ static int sandbox_sf_xfer(struct udevice *dev, unsigned int bitlen,
 	return pos == bytes ? 0 : -EIO;
 }
 
-int sandbox_sf_ofdata_to_platdata(struct udevice *dev)
+int sandbox_sf_of_to_plat(struct udevice *dev)
 {
 	struct sandbox_spi_flash_plat_data *pdata = dev_get_plat(dev);
 
@@ -597,7 +597,7 @@ U_BOOT_DRIVER(sandbox_sf_emul) = {
 	.name		= "sandbox_sf_emul",
 	.id		= UCLASS_SPI_EMUL,
 	.of_match	= sandbox_sf_ids,
-	.ofdata_to_platdata = sandbox_sf_ofdata_to_platdata,
+	.of_to_plat = sandbox_sf_of_to_plat,
 	.probe		= sandbox_sf_probe,
 	.remove		= sandbox_sf_remove,
 	.priv_auto	= sizeof(struct sandbox_spi_flash),
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index 5176efaa808..c16dff959b1 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -1250,7 +1250,7 @@ static const struct eth_ops ag7xxx_eth_ops = {
 	.write_hwaddr		= ag7xxx_eth_write_hwaddr,
 };
 
-static int ag7xxx_eth_ofdata_to_platdata(struct udevice *dev)
+static int ag7xxx_eth_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	const char *phy_mode;
@@ -1287,7 +1287,7 @@ U_BOOT_DRIVER(eth_ag7xxx) = {
 	.name		= "eth_ag7xxx",
 	.id		= UCLASS_ETH,
 	.of_match	= ag7xxx_eth_ids,
-	.ofdata_to_platdata = ag7xxx_eth_ofdata_to_platdata,
+	.of_to_plat = ag7xxx_eth_of_to_plat,
 	.probe		= ag7xxx_eth_probe,
 	.remove		= ag7xxx_eth_remove,
 	.ops		= &ag7xxx_eth_ops,
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index b7ed69413fe..456b7b98e91 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -672,7 +672,7 @@ static int altera_tse_probe(struct udevice *dev)
 	return ret;
 }
 
-static int altera_tse_ofdata_to_platdata(struct udevice *dev)
+static int altera_tse_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	const char *phy_mode;
@@ -710,7 +710,7 @@ U_BOOT_DRIVER(altera_tse) = {
 	.id	= UCLASS_ETH,
 	.of_match = altera_tse_ids,
 	.ops	= &altera_tse_ops,
-	.ofdata_to_platdata = altera_tse_ofdata_to_platdata,
+	.of_to_plat = altera_tse_of_to_plat,
 	.plat_auto	= sizeof(struct eth_pdata),
 	.priv_auto	= sizeof(struct altera_tse_priv),
 	.probe	= altera_tse_probe,
diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index 1627e933368..67839563dbe 100644
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -685,7 +685,7 @@ static const struct eth_ops bcmgenet_gmac_eth_ops = {
 	.stop                   = bcmgenet_gmac_eth_stop,
 };
 
-static int bcmgenet_eth_ofdata_to_platdata(struct udevice *dev)
+static int bcmgenet_eth_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
@@ -729,7 +729,7 @@ U_BOOT_DRIVER(eth_bcmgenet) = {
 	.name   = "eth_bcmgenet",
 	.id     = UCLASS_ETH,
 	.of_match = bcmgenet_eth_ids,
-	.ofdata_to_platdata = bcmgenet_eth_ofdata_to_platdata,
+	.of_to_plat = bcmgenet_eth_of_to_plat,
 	.probe  = bcmgenet_eth_probe,
 	.ops    = &bcmgenet_gmac_eth_ops,
 	.priv_auto	= sizeof(struct bcmgenet_eth_priv),
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index c0e5c0b4f08..9dba55adaa7 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -811,7 +811,7 @@ const struct eth_ops designware_eth_ops = {
 	.write_hwaddr		= designware_eth_write_hwaddr,
 };
 
-int designware_eth_ofdata_to_platdata(struct udevice *dev)
+int designware_eth_of_to_plat(struct udevice *dev)
 {
 	struct dw_eth_pdata *dw_pdata = dev_get_plat(dev);
 #if CONFIG_IS_ENABLED(DM_GPIO)
@@ -868,7 +868,7 @@ U_BOOT_DRIVER(eth_designware) = {
 	.name	= "eth_designware",
 	.id	= UCLASS_ETH,
 	.of_match = designware_eth_ids,
-	.ofdata_to_platdata = designware_eth_ofdata_to_platdata,
+	.of_to_plat = designware_eth_of_to_plat,
 	.bind	= designware_eth_bind,
 	.probe	= designware_eth_probe,
 	.remove	= designware_eth_remove,
diff --git a/drivers/net/designware.h b/drivers/net/designware.h
index ffaf5a14d07..a82afb99cab 100644
--- a/drivers/net/designware.h
+++ b/drivers/net/designware.h
@@ -251,7 +251,7 @@ struct dw_eth_dev {
 };
 
 #ifdef CONFIG_DM_ETH
-int designware_eth_ofdata_to_platdata(struct udevice *dev);
+int designware_eth_of_to_plat(struct udevice *dev);
 int designware_eth_probe(struct udevice *dev);
 extern const struct eth_ops designware_eth_ops;
 
diff --git a/drivers/net/dwmac_s700.c b/drivers/net/dwmac_s700.c
index adb865d02b8..efe3d1dade6 100644
--- a/drivers/net/dwmac_s700.c
+++ b/drivers/net/dwmac_s700.c
@@ -44,9 +44,9 @@ static int dwmac_s700_probe(struct udevice *dev)
 	return designware_eth_probe(dev);
 }
 
-static int dwmac_s700_ofdata_to_platdata(struct udevice *dev)
+static int dwmac_s700_of_to_plat(struct udevice *dev)
 {
-	return designware_eth_ofdata_to_platdata(dev);
+	return designware_eth_of_to_plat(dev);
 }
 
 static const struct udevice_id dwmac_s700_ids[] = {
@@ -58,7 +58,7 @@ U_BOOT_DRIVER(dwmac_s700) = {
 	.name   = "dwmac_s700",
 	.id     = UCLASS_ETH,
 	.of_match = dwmac_s700_ids,
-	.ofdata_to_platdata = dwmac_s700_ofdata_to_platdata,
+	.of_to_plat = dwmac_s700_of_to_plat,
 	.probe  = dwmac_s700_probe,
 	.ops    = &designware_eth_ops,
 	.priv_auto	= sizeof(struct dw_eth_dev),
diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c
index a3cd4d50cd8..6171dadedf4 100644
--- a/drivers/net/dwmac_socfpga.c
+++ b/drivers/net/dwmac_socfpga.c
@@ -25,7 +25,7 @@ struct dwmac_socfpga_platdata {
 	u32			reg_shift;
 };
 
-static int dwmac_socfpga_ofdata_to_platdata(struct udevice *dev)
+static int dwmac_socfpga_of_to_plat(struct udevice *dev)
 {
 	struct dwmac_socfpga_platdata *pdata = dev_get_plat(dev);
 	struct regmap *regmap;
@@ -61,7 +61,7 @@ static int dwmac_socfpga_ofdata_to_platdata(struct udevice *dev)
 	pdata->phy_intf = range + args.args[0];
 	pdata->reg_shift = args.args[1];
 
-	return designware_eth_ofdata_to_platdata(dev);
+	return designware_eth_of_to_plat(dev);
 }
 
 static int dwmac_socfpga_probe(struct udevice *dev)
@@ -115,7 +115,7 @@ U_BOOT_DRIVER(dwmac_socfpga) = {
 	.name		= "dwmac_socfpga",
 	.id		= UCLASS_ETH,
 	.of_match	= dwmac_socfpga_ids,
-	.ofdata_to_platdata = dwmac_socfpga_ofdata_to_platdata,
+	.of_to_plat = dwmac_socfpga_of_to_plat,
 	.probe		= dwmac_socfpga_probe,
 	.ops		= &designware_eth_ops,
 	.priv_auto	= sizeof(struct dw_eth_dev),
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 53c2d23cd18..7f146d4c8b4 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -685,7 +685,7 @@ static void ethoc_stop(struct udevice *dev)
 	ethoc_stop_common(dev_get_priv(dev));
 }
 
-static int ethoc_ofdata_to_platdata(struct udevice *dev)
+static int ethoc_of_to_plat(struct udevice *dev)
 {
 	struct ethoc_eth_pdata *pdata = dev_get_plat(dev);
 	fdt_addr_t addr;
@@ -746,7 +746,7 @@ U_BOOT_DRIVER(ethoc) = {
 	.name				= "ethoc",
 	.id				= UCLASS_ETH,
 	.of_match			= ethoc_ids,
-	.ofdata_to_platdata		= ethoc_ofdata_to_platdata,
+	.of_to_plat		= ethoc_of_to_plat,
 	.probe				= ethoc_probe,
 	.remove				= ethoc_remove,
 	.ops				= &ethoc_ops,
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index d3d71480478..e3b29a9c3e7 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -1528,7 +1528,7 @@ static int fecmxc_remove(struct udevice *dev)
 	return 0;
 }
 
-static int fecmxc_ofdata_to_platdata(struct udevice *dev)
+static int fecmxc_of_to_plat(struct udevice *dev)
 {
 	int ret = 0;
 	struct eth_pdata *pdata = dev_get_plat(dev);
@@ -1594,7 +1594,7 @@ U_BOOT_DRIVER(fecmxc_gem) = {
 	.name	= "fecmxc",
 	.id	= UCLASS_ETH,
 	.of_match = fecmxc_ids,
-	.ofdata_to_platdata = fecmxc_ofdata_to_platdata,
+	.of_to_plat = fecmxc_of_to_plat,
 	.probe	= fecmxc_probe,
 	.remove	= fecmxc_remove,
 	.ops	= &fecmxc_ops,
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index b71675f065d..0196462beb4 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -491,7 +491,7 @@ static const struct eth_ops mcdmafec_ops = {
 };
 
 /*
- * Boot sequence, called just after mcffec_ofdata_to_platdata,
+ * Boot sequence, called just after mcffec_of_to_plat,
  * as DM way, it replaces old mcffec_initialize.
  */
 static int mcdmafec_probe(struct udevice *dev)
@@ -565,7 +565,7 @@ static int mcdmafec_remove(struct udevice *dev)
 /*
  * Boot sequence, called 1st
  */
-static int mcdmafec_ofdata_to_platdata(struct udevice *dev)
+static int mcdmafec_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	const u32 *val;
@@ -590,7 +590,7 @@ U_BOOT_DRIVER(mcffec) = {
 	.name	= "mcdmafec",
 	.id	= UCLASS_ETH,
 	.of_match = mcdmafec_ids,
-	.ofdata_to_platdata = mcdmafec_ofdata_to_platdata,
+	.of_to_plat = mcdmafec_of_to_plat,
 	.probe	= mcdmafec_probe,
 	.remove	= mcdmafec_remove,
 	.ops	= &mcdmafec_ops,
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
index 805e3f7bfae..69e299d6a3d 100644
--- a/drivers/net/ftgmac100.c
+++ b/drivers/net/ftgmac100.c
@@ -511,7 +511,7 @@ static int ftgmac100_write_hwaddr(struct udevice *dev)
 	return ftgmac100_set_mac(priv, pdata->enetaddr);
 }
 
-static int ftgmac100_ofdata_to_platdata(struct udevice *dev)
+static int ftgmac100_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	struct ftgmac100_data *priv = dev_get_priv(dev);
@@ -609,7 +609,7 @@ U_BOOT_DRIVER(ftgmac100) = {
 	.name	= "ftgmac100",
 	.id	= UCLASS_ETH,
 	.of_match = ftgmac100_ids,
-	.ofdata_to_platdata = ftgmac100_ofdata_to_platdata,
+	.of_to_plat = ftgmac100_of_to_plat,
 	.probe	= ftgmac100_probe,
 	.remove = ftgmac100_remove,
 	.ops	= &ftgmac100_ops,
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 5c2887ec8ae..0d672374fda 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -393,7 +393,7 @@ static const char *dtbmacaddr(u32 ifno)
 	return NULL;
 }
 
-static int ftmac100_ofdata_to_platdata(struct udevice *dev)
+static int ftmac100_of_to_plat(struct udevice *dev)
 {
 	struct ftmac100_data *priv = dev_get_priv(dev);
 	struct eth_pdata *pdata = dev_get_plat(dev);
@@ -437,7 +437,7 @@ U_BOOT_DRIVER(ftmac100) = {
 	.id	= UCLASS_ETH,
 	.of_match = ftmac100_ids,
 	.bind	= ftmac100_bind,
-	.ofdata_to_platdata = ftmac100_ofdata_to_platdata,
+	.of_to_plat = ftmac100_of_to_plat,
 	.probe	= ftmac100_probe,
 	.ops	= &ftmac100_ops,
 	.priv_auto	= sizeof(struct ftmac100_data),
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index 2d94223c857..0073cb3bb13 100644
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -53,7 +53,7 @@ struct rk_gmac_ops {
 };
 
 
-static int gmac_rockchip_ofdata_to_platdata(struct udevice *dev)
+static int gmac_rockchip_of_to_plat(struct udevice *dev)
 {
 	struct gmac_rockchip_platdata *pdata = dev_get_plat(dev);
 	const char *string;
@@ -74,7 +74,7 @@ static int gmac_rockchip_ofdata_to_platdata(struct udevice *dev)
 	if (pdata->rx_delay == -ENOENT)
 		pdata->rx_delay = dev_read_u32_default(dev, "rx-delay", 0x10);
 
-	return designware_eth_ofdata_to_platdata(dev);
+	return designware_eth_of_to_plat(dev);
 }
 
 static int px30_gmac_fix_mac_speed(struct dw_eth_dev *priv)
@@ -756,7 +756,7 @@ U_BOOT_DRIVER(eth_gmac_rockchip) = {
 	.name	= "gmac_rockchip",
 	.id	= UCLASS_ETH,
 	.of_match = rockchip_gmac_ids,
-	.ofdata_to_platdata = gmac_rockchip_ofdata_to_platdata,
+	.of_to_plat = gmac_rockchip_of_to_plat,
 	.probe	= gmac_rockchip_probe,
 	.ops	= &gmac_rockchip_eth_ops,
 	.priv_auto	= sizeof(struct dw_eth_dev),
diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c
index e11335f54fb..aa79d6eda81 100644
--- a/drivers/net/higmacv300.c
+++ b/drivers/net/higmacv300.c
@@ -558,7 +558,7 @@ static int higmac_remove(struct udevice *dev)
 	return 0;
 }
 
-static int higmac_ofdata_to_platdata(struct udevice *dev)
+static int higmac_of_to_plat(struct udevice *dev)
 {
 	struct higmac_priv *priv = dev_get_priv(dev);
 	int phyintf = PHY_INTERFACE_MODE_NONE;
@@ -594,7 +594,7 @@ U_BOOT_DRIVER(eth_higmac) = {
 	.name	= "eth_higmac",
 	.id	= UCLASS_ETH,
 	.of_match = higmac_ids,
-	.ofdata_to_platdata = higmac_ofdata_to_platdata,
+	.of_to_plat = higmac_of_to_plat,
 	.probe	= higmac_probe,
 	.remove	= higmac_remove,
 	.ops	= &higmac_ops,
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index 05ef1abd5d5..91c2d10ffc8 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -665,7 +665,7 @@ static int ks8851_probe(struct udevice *dev)
 	return 0;
 }
 
-static int ks8851_ofdata_to_platdata(struct udevice *dev)
+static int ks8851_of_to_plat(struct udevice *dev)
 {
 	struct ks_net *ks = dev_get_priv(dev);
 	struct eth_pdata *pdata = dev_get_plat(dev);
@@ -695,7 +695,7 @@ U_BOOT_DRIVER(ks8851) = {
 	.id		= UCLASS_ETH,
 	.of_match	= ks8851_ids,
 	.bind		= ks8851_bind,
-	.ofdata_to_platdata = ks8851_ofdata_to_platdata,
+	.of_to_plat = ks8851_of_to_plat,
 	.probe		= ks8851_probe,
 	.ops		= &ks8851_ops,
 	.priv_auto	= sizeof(struct ks_net),
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index cd2e4e01dcd..ef013c9c97e 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -1160,7 +1160,7 @@ static int ldpaa_eth_bind(struct udevice *dev)
 	return 0;
 }
 
-static int ldpaa_eth_ofdata_to_platdata(struct udevice *dev)
+static int ldpaa_eth_of_to_plat(struct udevice *dev)
 {
 	struct ldpaa_eth_priv *priv = dev_get_priv(dev);
 	const char *phy_mode_str;
@@ -1187,7 +1187,7 @@ U_BOOT_DRIVER(ldpaa_eth) = {
 	.name = "ldpaa_eth",
 	.id = UCLASS_ETH,
 	.of_match = ldpaa_eth_of_ids,
-	.ofdata_to_platdata = ldpaa_eth_ofdata_to_platdata,
+	.of_to_plat = ldpaa_eth_of_to_plat,
 	.bind = ldpaa_eth_bind,
 	.probe = ldpaa_eth_probe,
 	.ops = &ldpaa_eth_ops,
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index dd23591e03a..e287c29e69f 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -1283,17 +1283,17 @@ static int macb_eth_remove(struct udevice *dev)
 }
 
 /**
- * macb_late_eth_ofdata_to_platdata
+ * macb_late_eth_of_to_plat
  * @dev:	udevice struct
  * Returns 0 when operation success and negative errno number
  * when operation failed.
  */
-int __weak macb_late_eth_ofdata_to_platdata(struct udevice *dev)
+int __weak macb_late_eth_of_to_plat(struct udevice *dev)
 {
 	return 0;
 }
 
-static int macb_eth_ofdata_to_platdata(struct udevice *dev)
+static int macb_eth_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 
@@ -1301,7 +1301,7 @@ static int macb_eth_ofdata_to_platdata(struct udevice *dev)
 	if (!pdata->iobase)
 		return -EINVAL;
 
-	return macb_late_eth_ofdata_to_platdata(dev);
+	return macb_late_eth_of_to_plat(dev);
 }
 
 static const struct macb_config sama5d4_config = {
@@ -1331,7 +1331,7 @@ U_BOOT_DRIVER(eth_macb) = {
 	.name	= "eth_macb",
 	.id	= UCLASS_ETH,
 	.of_match = macb_eth_ids,
-	.ofdata_to_platdata = macb_eth_ofdata_to_platdata,
+	.of_to_plat = macb_eth_of_to_plat,
 	.probe	= macb_eth_probe,
 	.remove	= macb_eth_remove,
 	.ops	= &macb_eth_ops,
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index 42752a76fa3..4fa71360cf4 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -513,7 +513,7 @@ static const struct eth_ops mcffec_ops = {
 };
 
 /*
- * Boot sequence, called just after mcffec_ofdata_to_platdata,
+ * Boot sequence, called just after mcffec_of_to_plat,
  * as DM way, it replaces old mcffec_initialize.
  */
 static int mcffec_probe(struct udevice *dev)
@@ -584,7 +584,7 @@ static int mcffec_remove(struct udevice *dev)
 /*
  * Boot sequence, called 1st
  */
-static int mcffec_ofdata_to_platdata(struct udevice *dev)
+static int mcffec_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	const u32 *val;
@@ -610,7 +610,7 @@ U_BOOT_DRIVER(mcffec) = {
 	.name	= "mcffec",
 	.id	= UCLASS_ETH,
 	.of_match = mcffec_ids,
-	.ofdata_to_platdata = mcffec_ofdata_to_platdata,
+	.of_to_plat = mcffec_of_to_plat,
 	.probe	= mcffec_probe,
 	.remove	= mcffec_remove,
 	.ops	= &mcffec_ops,
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index 2741439b54f..26f02847a2e 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -1407,7 +1407,7 @@ static int mtk_eth_remove(struct udevice *dev)
 	return 0;
 }
 
-static int mtk_eth_ofdata_to_platdata(struct udevice *dev)
+static int mtk_eth_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	struct mtk_eth_priv *priv = dev_get_priv(dev);
@@ -1558,7 +1558,7 @@ U_BOOT_DRIVER(mtk_eth) = {
 	.name = "mtk-eth",
 	.id = UCLASS_ETH,
 	.of_match = mtk_eth_ids,
-	.ofdata_to_platdata = mtk_eth_ofdata_to_platdata,
+	.of_to_plat = mtk_eth_of_to_plat,
 	.plat_auto	= sizeof(struct eth_pdata),
 	.probe = mtk_eth_probe,
 	.remove = mtk_eth_remove,
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index bf800a80642..2452859f814 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -986,7 +986,7 @@ static const struct eth_ops mvgbe_ops = {
 	.write_hwaddr	= mvgbe_write_hwaddr,
 };
 
-static int mvgbe_ofdata_to_platdata(struct udevice *dev)
+static int mvgbe_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	struct mvgbe_device *dmvgbe = dev_get_priv(dev);
@@ -1038,7 +1038,7 @@ U_BOOT_DRIVER(mvgbe) = {
 	.name	= "mvgbe",
 	.id	= UCLASS_ETH,
 	.of_match = mvgbe_ids,
-	.ofdata_to_platdata = mvgbe_ofdata_to_platdata,
+	.of_to_plat = mvgbe_of_to_plat,
 	.probe	= mvgbe_probe,
 	.ops	= &mvgbe_ops,
 	.priv_auto	= sizeof(struct mvgbe_device),
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 84426ef8ccd..3192cf55091 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -1732,7 +1732,7 @@ static int mvneta_probe(struct udevice *dev)
 	else
 		mvneta_conf_mbus_windows(pp);
 
-	/* PHY interface is already decoded in mvneta_ofdata_to_platdata() */
+	/* PHY interface is already decoded in mvneta_of_to_plat() */
 	pp->phy_interface = pdata->phy_interface;
 
 	/* fetch 'fixed-link' property from 'neta' node */
@@ -1795,7 +1795,7 @@ static const struct eth_ops mvneta_ops = {
 	.write_hwaddr	= mvneta_write_hwaddr,
 };
 
-static int mvneta_ofdata_to_platdata(struct udevice *dev)
+static int mvneta_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	const char *phy_mode;
@@ -1827,7 +1827,7 @@ U_BOOT_DRIVER(mvneta) = {
 	.name	= "mvneta",
 	.id	= UCLASS_ETH,
 	.of_match = mvneta_ids,
-	.ofdata_to_platdata = mvneta_ofdata_to_platdata,
+	.of_to_plat = mvneta_of_to_plat,
 	.probe	= mvneta_probe,
 	.ops	= &mvneta_ops,
 	.priv_auto	= sizeof(struct mvneta_port),
diff --git a/drivers/net/qe/dm_qe_uec.c b/drivers/net/qe/dm_qe_uec.c
index 372926e1a4b..a33068cc706 100644
--- a/drivers/net/qe/dm_qe_uec.c
+++ b/drivers/net/qe/dm_qe_uec.c
@@ -1129,7 +1129,7 @@ static int qe_uec_remove(struct udevice *dev)
 	return 0;
 }
 
-static int qe_uec_ofdata_to_platdata(struct udevice *dev)
+static int qe_uec_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	const char *phy_mode;
@@ -1158,7 +1158,7 @@ U_BOOT_DRIVER(eth_qe_uec) = {
 	.name	= QE_UEC_DRIVER_NAME,
 	.id	= UCLASS_ETH,
 	.of_match = qe_uec_ids,
-	.ofdata_to_platdata = qe_uec_ofdata_to_platdata,
+	.of_to_plat = qe_uec_of_to_plat,
 	.probe	= qe_uec_probe,
 	.remove = qe_uec_remove,
 	.ops	= &qe_uec_eth_ops,
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index 692cd57f687..34e2b8f9e96 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -642,7 +642,7 @@ static const struct eth_ops ravb_ops = {
 	.write_hwaddr		= ravb_write_hwaddr,
 };
 
-int ravb_ofdata_to_platdata(struct udevice *dev)
+int ravb_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	const char *phy_mode;
@@ -685,7 +685,7 @@ U_BOOT_DRIVER(eth_ravb) = {
 	.name		= "ravb",
 	.id		= UCLASS_ETH,
 	.of_match	= ravb_ids,
-	.ofdata_to_platdata = ravb_ofdata_to_platdata,
+	.of_to_plat = ravb_of_to_plat,
 	.probe		= ravb_probe,
 	.remove		= ravb_remove,
 	.ops		= &ravb_ops,
diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c
index 7a8bc1584e0..8273f73c911 100644
--- a/drivers/net/sandbox-raw.c
+++ b/drivers/net/sandbox-raw.c
@@ -149,7 +149,7 @@ static const struct eth_ops sb_eth_raw_ops = {
 	.read_rom_hwaddr	= sb_eth_raw_read_rom_hwaddr,
 };
 
-static int sb_eth_raw_ofdata_to_platdata(struct udevice *dev)
+static int sb_eth_raw_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	struct eth_sandbox_raw_priv *priv = dev_get_priv(dev);
@@ -191,7 +191,7 @@ U_BOOT_DRIVER(eth_sandbox_raw) = {
 	.name	= "eth_sandbox_raw",
 	.id	= UCLASS_ETH,
 	.of_match = sb_eth_raw_ids,
-	.ofdata_to_platdata = sb_eth_raw_ofdata_to_platdata,
+	.of_to_plat = sb_eth_raw_of_to_plat,
 	.ops	= &sb_eth_raw_ops,
 	.priv_auto	= sizeof(struct eth_sandbox_raw_priv),
 	.plat_auto	= sizeof(struct eth_pdata),
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index a672333c266..a389e2bd0d1 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -414,7 +414,7 @@ static int sb_eth_remove(struct udevice *dev)
 	return 0;
 }
 
-static int sb_eth_ofdata_to_platdata(struct udevice *dev)
+static int sb_eth_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	struct eth_sandbox_priv *priv = dev_get_priv(dev);
@@ -443,7 +443,7 @@ U_BOOT_DRIVER(eth_sandbox) = {
 	.name	= "eth_sandbox",
 	.id	= UCLASS_ETH,
 	.of_match = sb_eth_ids,
-	.ofdata_to_platdata = sb_eth_ofdata_to_platdata,
+	.of_to_plat = sb_eth_of_to_plat,
 	.remove	= sb_eth_remove,
 	.ops	= &sb_eth_ops,
 	.priv_auto	= sizeof(struct eth_sandbox_priv),
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 147b36e177a..1666a8cdb21 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -911,7 +911,7 @@ static const struct eth_ops sh_ether_ops = {
 	.write_hwaddr		= sh_ether_write_hwaddr,
 };
 
-int sh_ether_ofdata_to_platdata(struct udevice *dev)
+int sh_ether_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	const char *phy_mode;
@@ -953,7 +953,7 @@ U_BOOT_DRIVER(eth_sh_ether) = {
 	.name		= "sh_ether",
 	.id		= UCLASS_ETH,
 	.of_match	= sh_ether_ids,
-	.ofdata_to_platdata = sh_ether_ofdata_to_platdata,
+	.of_to_plat = sh_ether_of_to_plat,
 	.probe		= sh_ether_probe,
 	.remove		= sh_ether_remove,
 	.ops		= &sh_ether_ops,
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index e3057a9156e..7b79831c281 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -607,7 +607,7 @@ static int smc911x_probe(struct udevice *dev)
 	return 0;
 }
 
-static int smc911x_ofdata_to_platdata(struct udevice *dev)
+static int smc911x_of_to_plat(struct udevice *dev)
 {
 	struct smc911x_priv *priv = dev_get_priv(dev);
 	struct eth_pdata *pdata = dev_get_plat(dev);
@@ -636,7 +636,7 @@ U_BOOT_DRIVER(smc911x) = {
 	.id		= UCLASS_ETH,
 	.of_match	= smc911x_ids,
 	.bind		= smc911x_bind,
-	.ofdata_to_platdata = smc911x_ofdata_to_platdata,
+	.of_to_plat = smc911x_of_to_plat,
 	.probe		= smc911x_probe,
 	.ops		= &smc911x_ops,
 	.priv_auto	= sizeof(struct smc911x_priv),
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index 9a1b2eb7124..0ebe86a333b 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -732,7 +732,7 @@ static int ave_pxs3_get_pinmode(struct ave_private *priv)
 	return 0;
 }
 
-static int ave_ofdata_to_platdata(struct udevice *dev)
+static int ave_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	struct ave_private *priv = dev_get_priv(dev);
@@ -996,7 +996,7 @@ U_BOOT_DRIVER(ave) = {
 	.of_match = ave_ids,
 	.probe	  = ave_probe,
 	.remove	  = ave_remove,
-	.ofdata_to_platdata = ave_ofdata_to_platdata,
+	.of_to_plat = ave_of_to_plat,
 	.ops	  = &ave_ops,
 	.priv_auto	= sizeof(struct ave_private),
 	.plat_auto	= sizeof(struct eth_pdata),
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index a9d04ebedd2..cf15e9f475b 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -861,7 +861,7 @@ static int sun8i_handle_internal_phy(struct udevice *dev, struct emac_eth_dev *p
 	return 0;
 }
 
-static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev)
+static int sun8i_emac_eth_of_to_plat(struct udevice *dev)
 {
 	struct sun8i_eth_pdata *sun8i_pdata = dev_get_plat(dev);
 	struct eth_pdata *pdata = &sun8i_pdata->eth_pdata;
@@ -1001,7 +1001,7 @@ U_BOOT_DRIVER(eth_sun8i_emac) = {
 	.name   = "eth_sun8i_emac",
 	.id     = UCLASS_ETH,
 	.of_match = sun8i_emac_eth_ids,
-	.ofdata_to_platdata = sun8i_emac_eth_ofdata_to_platdata,
+	.of_to_plat = sun8i_emac_eth_of_to_plat,
 	.probe  = sun8i_emac_eth_probe,
 	.ops    = &sun8i_emac_eth_ops,
 	.priv_auto	= sizeof(struct emac_eth_dev),
diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c
index 1b01a4765c9..7c6ae3cb814 100644
--- a/drivers/net/sunxi_emac.c
+++ b/drivers/net/sunxi_emac.c
@@ -591,7 +591,7 @@ static const struct eth_ops sunxi_emac_eth_ops = {
 	.stop			= sunxi_emac_eth_stop,
 };
 
-static int sunxi_emac_eth_ofdata_to_platdata(struct udevice *dev)
+static int sunxi_emac_eth_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 
@@ -609,7 +609,7 @@ U_BOOT_DRIVER(eth_sunxi_emac) = {
 	.name	= "eth_sunxi_emac",
 	.id	= UCLASS_ETH,
 	.of_match = sunxi_emac_eth_ids,
-	.ofdata_to_platdata = sunxi_emac_eth_ofdata_to_platdata,
+	.of_to_plat = sunxi_emac_eth_of_to_plat,
 	.probe	= sunxi_emac_eth_probe,
 	.ops	= &sunxi_emac_eth_ops,
 	.priv_auto	= sizeof(struct emac_eth_dev),
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index 9aa1858625e..68f4191fe97 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -1223,7 +1223,7 @@ static void cpsw_eth_of_parse_slave(struct cpsw_platform_data *data,
 							"max-speed", 0);
 }
 
-static int cpsw_eth_ofdata_to_platdata(struct udevice *dev)
+static int cpsw_eth_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	struct cpsw_platform_data *data;
@@ -1377,7 +1377,7 @@ U_BOOT_DRIVER(eth_cpsw) = {
 	.id	= UCLASS_ETH,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.of_match = cpsw_eth_ids,
-	.ofdata_to_platdata = cpsw_eth_ofdata_to_platdata,
+	.of_to_plat = cpsw_eth_of_to_plat,
 	.plat_auto	= sizeof(struct eth_pdata),
 #endif
 	.probe	= cpsw_eth_probe,
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 8e9eca19f3b..35b796c9136 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -747,7 +747,7 @@ static int ks2_eth_parse_slave_interface(int netcp, int slave,
 	return 0;
 }
 
-static int ks2_sl_eth_ofdata_to_platdata(struct udevice *dev)
+static int ks2_sl_eth_of_to_plat(struct udevice *dev)
 {
 	struct ks2_eth_priv *priv = dev_get_priv(dev);
 	struct eth_pdata *pdata = dev_get_plat(dev);
@@ -770,7 +770,7 @@ static int ks2_sl_eth_ofdata_to_platdata(struct udevice *dev)
 	return 0;
 }
 
-static int ks2_eth_ofdata_to_platdata(struct udevice *dev)
+static int ks2_eth_of_to_plat(struct udevice *dev)
 {
 	struct ks2_eth_priv *priv = dev_get_priv(dev);
 	struct eth_pdata *pdata = dev_get_plat(dev);
@@ -800,7 +800,7 @@ static const struct udevice_id ks2_eth_ids[] = {
 U_BOOT_DRIVER(eth_ks2_slave) = {
 	.name	= "eth_ks2_sl",
 	.id	= UCLASS_ETH,
-	.ofdata_to_platdata = ks2_sl_eth_ofdata_to_platdata,
+	.of_to_plat = ks2_sl_eth_of_to_plat,
 	.probe	= ks2_eth_probe,
 	.remove	= ks2_eth_remove,
 	.ops	= &ks2_eth_ops,
@@ -813,7 +813,7 @@ U_BOOT_DRIVER(eth_ks2) = {
 	.name	= "eth_ks2",
 	.id	= UCLASS_ETH,
 	.of_match = ks2_eth_ids,
-	.ofdata_to_platdata = ks2_eth_ofdata_to_platdata,
+	.of_to_plat = ks2_eth_of_to_plat,
 	.probe	= ks2_eth_probe,
 	.remove	= ks2_eth_remove,
 	.ops	= &ks2_eth_ops,
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index 3057fba604d..343ab69d194 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -726,7 +726,7 @@ static const struct eth_ops axi_emac_ops = {
 	.write_hwaddr		= axiemac_write_hwaddr,
 };
 
-static int axi_emac_ofdata_to_platdata(struct udevice *dev)
+static int axi_emac_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	struct axidma_priv *priv = dev_get_priv(dev);
@@ -787,7 +787,7 @@ U_BOOT_DRIVER(axi_emac) = {
 	.name	= "axi_emac",
 	.id	= UCLASS_ETH,
 	.of_match = axi_emac_ids,
-	.ofdata_to_platdata = axi_emac_ofdata_to_platdata,
+	.of_to_plat = axi_emac_of_to_plat,
 	.probe	= axi_emac_probe,
 	.remove	= axi_emac_remove,
 	.ops	= &axi_emac_ops,
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index c0d73bc9747..5c768875199 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -593,7 +593,7 @@ static const struct eth_ops emaclite_ops = {
 	.stop = emaclite_stop,
 };
 
-static int emaclite_ofdata_to_platdata(struct udevice *dev)
+static int emaclite_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	struct xemaclite *emaclite = dev_get_priv(dev);
@@ -631,7 +631,7 @@ U_BOOT_DRIVER(emaclite) = {
 	.name   = "emaclite",
 	.id     = UCLASS_ETH,
 	.of_match = emaclite_ids,
-	.ofdata_to_platdata = emaclite_ofdata_to_platdata,
+	.of_to_plat = emaclite_of_to_plat,
 	.probe  = emaclite_probe,
 	.remove = emaclite_remove,
 	.ops    = &emaclite_ops,
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 103f2940b45..5cb02bb3a7d 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -743,7 +743,7 @@ static const struct eth_ops zynq_gem_ops = {
 	.read_rom_hwaddr	= zynq_gem_read_rom_mac,
 };
 
-static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
+static int zynq_gem_of_to_plat(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	struct zynq_gem_priv *priv = dev_get_priv(dev);
@@ -807,7 +807,7 @@ U_BOOT_DRIVER(zynq_gem) = {
 	.name	= "zynq_gem",
 	.id	= UCLASS_ETH,
 	.of_match = zynq_gem_ids,
-	.ofdata_to_platdata = zynq_gem_ofdata_to_platdata,
+	.of_to_plat = zynq_gem_of_to_plat,
 	.probe	= zynq_gem_probe,
 	.remove	= zynq_gem_remove,
 	.ops	= &zynq_gem_ops,
diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
index 2ce23ec7805..a9ca5c2d7b1 100644
--- a/drivers/pci/pci-aardvark.c
+++ b/drivers/pci/pci-aardvark.c
@@ -660,7 +660,7 @@ static int pcie_advk_remove(struct udevice *dev)
 }
 
 /**
- * pcie_advk_ofdata_to_platdata() - Translate from DT to device state
+ * pcie_advk_of_to_plat() - Translate from DT to device state
  *
  * @dev: A pointer to the device being operated on
  *
@@ -670,7 +670,7 @@ static int pcie_advk_remove(struct udevice *dev)
  *
  * Return: 0 on success, else -EINVAL
  */
-static int pcie_advk_ofdata_to_platdata(struct udevice *dev)
+static int pcie_advk_of_to_plat(struct udevice *dev)
 {
 	struct pcie_advk *pcie = dev_get_priv(dev);
 
@@ -697,7 +697,7 @@ U_BOOT_DRIVER(pcie_advk) = {
 	.id			= UCLASS_PCI,
 	.of_match		= pcie_advk_ids,
 	.ops			= &pcie_advk_ops,
-	.ofdata_to_platdata	= pcie_advk_ofdata_to_platdata,
+	.of_to_plat	= pcie_advk_of_to_plat,
 	.probe			= pcie_advk_probe,
 	.remove			= pcie_advk_remove,
 	.flags			= DM_FLAG_OS_PREPARE,
diff --git a/drivers/pci/pci-rcar-gen2.c b/drivers/pci/pci-rcar-gen2.c
index cff1a41f024..dc114027814 100644
--- a/drivers/pci/pci-rcar-gen2.c
+++ b/drivers/pci/pci-rcar-gen2.c
@@ -231,7 +231,7 @@ static int rcar_gen2_pci_probe(struct udevice *dev)
 	return 0;
 }
 
-static int rcar_gen2_pci_ofdata_to_platdata(struct udevice *dev)
+static int rcar_gen2_pci_of_to_plat(struct udevice *dev)
 {
 	struct rcar_gen2_pci_priv *priv = dev_get_priv(dev);
 
@@ -259,6 +259,6 @@ U_BOOT_DRIVER(rcar_gen2_pci) = {
 	.of_match		= rcar_gen2_pci_ids,
 	.ops			= &rcar_gen2_pci_ops,
 	.probe			= rcar_gen2_pci_probe,
-	.ofdata_to_platdata	= rcar_gen2_pci_ofdata_to_platdata,
+	.of_to_plat	= rcar_gen2_pci_of_to_plat,
 	.priv_auto	= sizeof(struct rcar_gen2_pci_priv),
 };
diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c
index 9ef6314462b..0d5b01f9f81 100644
--- a/drivers/pci/pci-rcar-gen3.c
+++ b/drivers/pci/pci-rcar-gen3.c
@@ -372,7 +372,7 @@ static int rcar_gen3_pcie_probe(struct udevice *dev)
 	return 0;
 }
 
-static int rcar_gen3_pcie_ofdata_to_platdata(struct udevice *dev)
+static int rcar_gen3_pcie_of_to_plat(struct udevice *dev)
 {
 	struct rcar_gen3_pcie_priv *priv = dev_get_plat(dev);
 
@@ -399,6 +399,6 @@ U_BOOT_DRIVER(rcar_gen3_pcie) = {
 	.of_match		= rcar_gen3_pcie_ids,
 	.ops			= &rcar_gen3_pcie_ops,
 	.probe			= rcar_gen3_pcie_probe,
-	.ofdata_to_platdata	= rcar_gen3_pcie_ofdata_to_platdata,
+	.of_to_plat	= rcar_gen3_pcie_of_to_plat,
 	.plat_auto	= sizeof(struct rcar_gen3_pcie_priv),
 };
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index f6e3b3863a1..229d1c8002e 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -58,7 +58,7 @@ pci_dev_t dm_pci_get_bdf(const struct udevice *dev)
 	 * will produce a bad BDF>
 	 *
 	 * A common cause of this problem is that this function is called in the
-	 * ofdata_to_platdata() method of @dev. Accessing the PCI bus in that
+	 * of_to_plat() method of @dev. Accessing the PCI bus in that
 	 * method is not allowed, since it has not yet been probed. To fix this,
 	 * move that access to the probe() method of @dev instead.
 	 */
diff --git a/drivers/pci/pci_mpc85xx.c b/drivers/pci/pci_mpc85xx.c
index 9cb95da1753..ab6ff45a511 100644
--- a/drivers/pci/pci_mpc85xx.c
+++ b/drivers/pci/pci_mpc85xx.c
@@ -122,7 +122,7 @@ static int mpc85xx_pci_dm_remove(struct udevice *dev)
 	return 0;
 }
 
-static int mpc85xx_pci_ofdata_to_platdata(struct udevice *dev)
+static int mpc85xx_pci_of_to_plat(struct udevice *dev)
 {
 	struct mpc85xx_pci_priv *priv = dev_get_priv(dev);
 	fdt_addr_t addr;
@@ -154,6 +154,6 @@ U_BOOT_DRIVER(mpc85xx_pci) = {
 	.ops			= &mpc85xx_pci_ops,
 	.probe			= mpc85xx_pci_dm_probe,
 	.remove			= mpc85xx_pci_dm_remove,
-	.ofdata_to_platdata	= mpc85xx_pci_ofdata_to_platdata,
+	.of_to_plat	= mpc85xx_pci_of_to_plat,
 	.priv_auto	= sizeof(struct mpc85xx_pci_priv),
 };
diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index f2d6222bd8a..cf6e0a2e7cb 100644
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -410,7 +410,7 @@ static int mvebu_get_tgt_attr(ofnode node, int devfn,
 	return -ENOENT;
 }
 
-static int mvebu_pcie_ofdata_to_platdata(struct udevice *dev)
+static int mvebu_pcie_of_to_plat(struct udevice *dev)
 {
 	struct mvebu_pcie *pcie = dev_get_plat(dev);
 	int ret = 0;
@@ -470,7 +470,7 @@ static struct driver pcie_mvebu_drv = {
 	.id			= UCLASS_PCI,
 	.ops			= &mvebu_pcie_ops,
 	.probe			= mvebu_pcie_probe,
-	.ofdata_to_platdata	= mvebu_pcie_ofdata_to_platdata,
+	.of_to_plat	= mvebu_pcie_of_to_plat,
 	.plat_auto	= sizeof(struct mvebu_pcie),
 };
 
diff --git a/drivers/pci/pci_octeontx.c b/drivers/pci/pci_octeontx.c
index d211d22226e..16932839a58 100644
--- a/drivers/pci/pci_octeontx.c
+++ b/drivers/pci/pci_octeontx.c
@@ -311,7 +311,7 @@ int pci_octeontx_write_config(struct udevice *bus, pci_dev_t bdf,
 	return ret;
 }
 
-static int pci_octeontx_ofdata_to_platdata(struct udevice *dev)
+static int pci_octeontx_of_to_plat(struct udevice *dev)
 {
 	return 0;
 }
@@ -357,7 +357,7 @@ U_BOOT_DRIVER(pci_octeontx) = {
 	.id	= UCLASS_PCI,
 	.of_match = pci_octeontx_ids,
 	.ops	= &pci_octeontx_ops,
-	.ofdata_to_platdata = pci_octeontx_ofdata_to_platdata,
+	.of_to_plat = pci_octeontx_of_to_plat,
 	.probe	= pci_octeontx_probe,
 	.priv_auto	= sizeof(struct octeontx_pci),
 	.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c
index 386b25a77aa..9cb4414836f 100644
--- a/drivers/pci/pci_tegra.c
+++ b/drivers/pci/pci_tegra.c
@@ -1092,7 +1092,7 @@ static const struct tegra_pcie_soc pci_tegra_soc[] = {
 	},
 };
 
-static int pci_tegra_ofdata_to_platdata(struct udevice *dev)
+static int pci_tegra_of_to_plat(struct udevice *dev)
 {
 	struct tegra_pcie *pcie = dev_get_priv(dev);
 	enum tegra_pci_id id;
@@ -1197,7 +1197,7 @@ U_BOOT_DRIVER(pci_tegra) = {
 	.id	= UCLASS_PCI,
 	.of_match = pci_tegra_ids,
 	.ops	= &pci_tegra_ops,
-	.ofdata_to_platdata = pci_tegra_ofdata_to_platdata,
+	.of_to_plat = pci_tegra_of_to_plat,
 	.probe	= pci_tegra_probe,
 	.priv_auto	= sizeof(struct tegra_pcie),
 };
diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c
index 8f084df4882..dd2a4ef629b 100644
--- a/drivers/pci/pcie_brcmstb.c
+++ b/drivers/pci/pcie_brcmstb.c
@@ -579,7 +579,7 @@ static int brcm_pcie_probe(struct udevice *dev)
 	return 0;
 }
 
-static int brcm_pcie_ofdata_to_platdata(struct udevice *dev)
+static int brcm_pcie_of_to_plat(struct udevice *dev)
 {
 	struct brcm_pcie *pcie = dev_get_priv(dev);
 	ofnode dn = dev_ofnode(dev);
@@ -618,6 +618,6 @@ U_BOOT_DRIVER(pcie_brcm_base) = {
 	.ops			= &brcm_pcie_ops,
 	.of_match		= brcm_pcie_ids,
 	.probe			= brcm_pcie_probe,
-	.ofdata_to_platdata	= brcm_pcie_ofdata_to_platdata,
+	.of_to_plat	= brcm_pcie_of_to_plat,
 	.priv_auto	= sizeof(struct brcm_pcie),
 };
diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c
index cacb5e98e7b..7ec149d178c 100644
--- a/drivers/pci/pcie_dw_mvebu.c
+++ b/drivers/pci/pcie_dw_mvebu.c
@@ -535,7 +535,7 @@ static int pcie_dw_mvebu_probe(struct udevice *dev)
 }
 
 /**
- * pcie_dw_mvebu_ofdata_to_platdata() - Translate from DT to device state
+ * pcie_dw_mvebu_of_to_plat() - Translate from DT to device state
  *
  * @dev: A pointer to the device being operated on
  *
@@ -545,7 +545,7 @@ static int pcie_dw_mvebu_probe(struct udevice *dev)
  *
  * Return: 0 on success, else -EINVAL
  */
-static int pcie_dw_mvebu_ofdata_to_platdata(struct udevice *dev)
+static int pcie_dw_mvebu_of_to_plat(struct udevice *dev)
 {
 	struct pcie_dw_mvebu *pcie = dev_get_priv(dev);
 
@@ -578,7 +578,7 @@ U_BOOT_DRIVER(pcie_dw_mvebu) = {
 	.id			= UCLASS_PCI,
 	.of_match		= pcie_dw_mvebu_ids,
 	.ops			= &pcie_dw_mvebu_ops,
-	.ofdata_to_platdata	= pcie_dw_mvebu_ofdata_to_platdata,
+	.of_to_plat	= pcie_dw_mvebu_of_to_plat,
 	.probe			= pcie_dw_mvebu_probe,
 	.priv_auto	= sizeof(struct pcie_dw_mvebu),
 };
diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c
index 20444d990e1..5e00fcda97a 100644
--- a/drivers/pci/pcie_dw_ti.c
+++ b/drivers/pci/pcie_dw_ti.c
@@ -671,7 +671,7 @@ static int pcie_dw_ti_probe(struct udevice *dev)
 }
 
 /**
- * pcie_dw_ti_ofdata_to_platdata() - Translate from DT to device state
+ * pcie_dw_ti_of_to_plat() - Translate from DT to device state
  *
  * @dev: A pointer to the device being operated on
  *
@@ -681,7 +681,7 @@ static int pcie_dw_ti_probe(struct udevice *dev)
  *
  * Return: 0 on success, else -EINVAL
  */
-static int pcie_dw_ti_ofdata_to_platdata(struct udevice *dev)
+static int pcie_dw_ti_of_to_plat(struct udevice *dev)
 {
 	struct pcie_dw_ti *pcie = dev_get_priv(dev);
 
@@ -724,7 +724,7 @@ U_BOOT_DRIVER(pcie_dw_ti) = {
 	.id			= UCLASS_PCI,
 	.of_match		= pcie_dw_ti_ids,
 	.ops			= &pcie_dw_ti_ops,
-	.ofdata_to_platdata	= pcie_dw_ti_ofdata_to_platdata,
+	.of_to_plat	= pcie_dw_ti_of_to_plat,
 	.probe			= pcie_dw_ti_probe,
 	.priv_auto	= sizeof(struct pcie_dw_ti),
 };
diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c
index 1e06b7b6e0b..7d1f13d637c 100644
--- a/drivers/pci/pcie_ecam_generic.c
+++ b/drivers/pci/pcie_ecam_generic.c
@@ -113,7 +113,7 @@ static int pci_generic_ecam_write_config(struct udevice *bus, pci_dev_t bdf,
 }
 
 /**
- * pci_generic_ecam_ofdata_to_platdata() - Translate from DT to device state
+ * pci_generic_ecam_of_to_plat() - Translate from DT to device state
  * @dev: A pointer to the device being operated on
  *
  * Translate relevant data from the device tree pertaining to device @dev into
@@ -122,7 +122,7 @@ static int pci_generic_ecam_write_config(struct udevice *bus, pci_dev_t bdf,
  *
  * Return: 0 on success, else -EINVAL
  */
-static int pci_generic_ecam_ofdata_to_platdata(struct udevice *dev)
+static int pci_generic_ecam_of_to_plat(struct udevice *dev)
 {
 	struct generic_ecam_pcie *pcie = dev_get_priv(dev);
 	struct fdt_resource reg_res;
@@ -167,6 +167,6 @@ U_BOOT_DRIVER(pci_generic_ecam) = {
 	.of_match		= pci_generic_ecam_ids,
 	.ops			= &pci_generic_ecam_ops,
 	.probe			= pci_generic_ecam_probe,
-	.ofdata_to_platdata	= pci_generic_ecam_ofdata_to_platdata,
+	.of_to_plat	= pci_generic_ecam_of_to_plat,
 	.priv_auto	= sizeof(struct generic_ecam_pcie),
 };
diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c
index 7e68c0a9d02..b061b31cae5 100644
--- a/drivers/pci/pcie_fsl.c
+++ b/drivers/pci/pcie_fsl.c
@@ -593,7 +593,7 @@ static int fsl_pcie_probe(struct udevice *dev)
 	return 0;
 }
 
-static int fsl_pcie_ofdata_to_platdata(struct udevice *dev)
+static int fsl_pcie_of_to_plat(struct udevice *dev)
 {
 	struct fsl_pcie *pcie = dev_get_priv(dev);
 	struct fsl_pcie_data *info;
@@ -661,7 +661,7 @@ U_BOOT_DRIVER(fsl_pcie) = {
 	.id = UCLASS_PCI,
 	.of_match = fsl_pcie_ids,
 	.ops = &fsl_pcie_ops,
-	.ofdata_to_platdata = fsl_pcie_ofdata_to_platdata,
+	.of_to_plat = fsl_pcie_of_to_plat,
 	.probe = fsl_pcie_probe,
 	.priv_auto	= sizeof(struct fsl_pcie),
 };
diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index ebf9b8813da..d9c2325a221 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -799,7 +799,7 @@ static int imx_pcie_dm_remove(struct udevice *dev)
 	return 0;
 }
 
-static int imx_pcie_ofdata_to_platdata(struct udevice *dev)
+static int imx_pcie_of_to_plat(struct udevice *dev)
 {
 	struct imx_pcie_priv *priv = dev_get_priv(dev);
 
@@ -829,7 +829,7 @@ U_BOOT_DRIVER(imx_pcie) = {
 	.ops			= &imx_pcie_ops,
 	.probe			= imx_pcie_dm_probe,
 	.remove			= imx_pcie_dm_remove,
-	.ofdata_to_platdata	= imx_pcie_ofdata_to_platdata,
+	.of_to_plat	= imx_pcie_of_to_plat,
 	.priv_auto	= sizeof(struct imx_pcie_priv),
 	.flags			= DM_FLAG_OS_PREPARE,
 };
diff --git a/drivers/pci/pcie_intel_fpga.c b/drivers/pci/pcie_intel_fpga.c
index 641a770ee56..b4964757c78 100644
--- a/drivers/pci/pcie_intel_fpga.c
+++ b/drivers/pci/pcie_intel_fpga.c
@@ -379,7 +379,7 @@ static int pcie_intel_fpga_probe(struct udevice *dev)
 	return 0;
 }
 
-static int pcie_intel_fpga_ofdata_to_platdata(struct udevice *dev)
+static int pcie_intel_fpga_of_to_plat(struct udevice *dev)
 {
 	struct intel_fpga_pcie *pcie = dev_get_priv(dev);
 	struct fdt_resource reg_res;
@@ -428,7 +428,7 @@ U_BOOT_DRIVER(pcie_intel_fpga) = {
 	.id			= UCLASS_PCI,
 	.of_match		= pcie_intel_fpga_ids,
 	.ops			= &pcie_intel_fpga_ops,
-	.ofdata_to_platdata	= pcie_intel_fpga_ofdata_to_platdata,
+	.of_to_plat	= pcie_intel_fpga_of_to_plat,
 	.probe			= pcie_intel_fpga_probe,
 	.priv_auto	= sizeof(struct intel_fpga_pcie),
 };
diff --git a/drivers/pci/pcie_phytium.c b/drivers/pci/pcie_phytium.c
index cce78714b30..03ea04ceaa9 100644
--- a/drivers/pci/pcie_phytium.c
+++ b/drivers/pci/pcie_phytium.c
@@ -147,7 +147,7 @@ static int pci_phytium_write_config(struct udevice *bus, pci_dev_t bdf,
 }
 
 /**
- * pci_phytium_ofdata_to_platdata() - Translate from DT to device state
+ * pci_phytium_of_to_plat() - Translate from DT to device state
  * @dev: A pointer to the device being operated on
  *
  * Translate relevant data from the device tree pertaining to device @dev into
@@ -156,7 +156,7 @@ static int pci_phytium_write_config(struct udevice *bus, pci_dev_t bdf,
  *
  * Return: 0 on success, else -EINVAL
  */
-static int pci_phytium_ofdata_to_platdata(struct udevice *dev)
+static int pci_phytium_of_to_plat(struct udevice *dev)
 {
 	struct phytium_pcie *pcie = dev_get_priv(dev);
 	struct fdt_resource reg_res;
@@ -194,6 +194,6 @@ U_BOOT_DRIVER(pci_phytium) = {
 	.id			= UCLASS_PCI,
 	.of_match		= pci_phytium_ids,
 	.ops			= &pci_phytium_ops,
-	.ofdata_to_platdata	= pci_phytium_ofdata_to_platdata,
+	.of_to_plat	= pci_phytium_of_to_plat,
 	.priv_auto	= sizeof(struct phytium_pcie),
 };
diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c
index 7aaee77662b..00879a2d729 100644
--- a/drivers/pci/pcie_xilinx.c
+++ b/drivers/pci/pcie_xilinx.c
@@ -129,7 +129,7 @@ static int pcie_xilinx_write_config(struct udevice *bus, pci_dev_t bdf,
 }
 
 /**
- * pcie_xilinx_ofdata_to_platdata() - Translate from DT to device state
+ * pcie_xilinx_of_to_plat() - Translate from DT to device state
  * @dev: A pointer to the device being operated on
  *
  * Translate relevant data from the device tree pertaining to device @dev into
@@ -138,7 +138,7 @@ static int pcie_xilinx_write_config(struct udevice *bus, pci_dev_t bdf,
  *
  * Return: 0 on success, else -EINVAL
  */
-static int pcie_xilinx_ofdata_to_platdata(struct udevice *dev)
+static int pcie_xilinx_of_to_plat(struct udevice *dev)
 {
 	struct xilinx_pcie *pcie = dev_get_priv(dev);
 	struct fdt_resource reg_res;
@@ -174,6 +174,6 @@ U_BOOT_DRIVER(pcie_xilinx) = {
 	.id			= UCLASS_PCI,
 	.of_match		= pcie_xilinx_ids,
 	.ops			= &pcie_xilinx_ops,
-	.ofdata_to_platdata	= pcie_xilinx_ofdata_to_platdata,
+	.of_to_plat	= pcie_xilinx_of_to_plat,
 	.priv_auto	= sizeof(struct xilinx_pcie),
 };
diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
index 42e05b0e707..44a310f83de 100644
--- a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
+++ b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
@@ -104,7 +104,7 @@ static const struct udevice_id bcm2835_pinctrl_id[] = {
 	{}
 };
 
-int bcm283x_pinctl_ofdata_to_platdata(struct udevice *dev)
+int bcm283x_pinctl_of_to_plat(struct udevice *dev)
 {
 	struct bcm283x_pinctrl_priv *priv;
 
@@ -149,7 +149,7 @@ U_BOOT_DRIVER(pinctrl_bcm283x) = {
 	.name		= "bcm283x_pinctrl",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= of_match_ptr(bcm2835_pinctrl_id),
-	.ofdata_to_platdata = bcm283x_pinctl_ofdata_to_platdata,
+	.of_to_plat = bcm283x_pinctl_of_to_plat,
 	.priv_auto	= sizeof(struct bcm283x_pinctrl_priv),
 	.ops		= &bcm283x_pinctrl_ops,
 	.probe		= bcm283x_pinctl_probe,
diff --git a/drivers/pinctrl/intel/pinctrl.c b/drivers/pinctrl/intel/pinctrl.c
index 576e1b4728a..64cde5e329c 100644
--- a/drivers/pinctrl/intel/pinctrl.c
+++ b/drivers/pinctrl/intel/pinctrl.c
@@ -143,7 +143,7 @@ static int pinctrl_get_device(uint pad, struct udevice **devp)
 
 	/*
 	 * We have to probe each one of these since the community link is only
-	 * attached in intel_pinctrl_ofdata_to_platdata().
+	 * attached in intel_pinctrl_of_to_plat().
 	 */
 	uclass_foreach_dev_probe(UCLASS_PINCTRL, dev) {
 		struct intel_pinctrl_priv *priv = dev_get_priv(dev);
@@ -613,9 +613,8 @@ int pinctrl_config_pads_for_node(struct udevice *dev, ofnode node)
 	return 0;
 }
 
-int intel_pinctrl_ofdata_to_platdata(struct udevice *dev,
-				     const struct pad_community *comm,
-				     int num_cfgs)
+int intel_pinctrl_of_to_plat(struct udevice *dev,
+			     const struct pad_community *comm, int num_cfgs)
 {
 	struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev);
 	struct intel_pinctrl_priv *priv = dev_get_priv(dev);
diff --git a/drivers/pinctrl/intel/pinctrl_apl.c b/drivers/pinctrl/intel/pinctrl_apl.c
index b34cae60044..2432f3f363f 100644
--- a/drivers/pinctrl/intel/pinctrl_apl.c
+++ b/drivers/pinctrl/intel/pinctrl_apl.c
@@ -136,7 +136,7 @@ static const struct pad_community apl_gpio_communities[] = {
 	},
 };
 
-static int apl_pinctrl_ofdata_to_platdata(struct udevice *dev)
+static int apl_pinctrl_of_to_plat(struct udevice *dev)
 {
 	struct p2sb_child_platdata *pplat;
 	const struct pad_community *comm = NULL;
@@ -166,7 +166,7 @@ static int apl_pinctrl_ofdata_to_platdata(struct udevice *dev)
 			comm = &apl_gpio_communities[i];
 	}
 
-	return intel_pinctrl_ofdata_to_platdata(dev, comm, 2);
+	return intel_pinctrl_of_to_plat(dev, comm, 2);
 }
 
 static const struct udevice_id apl_gpio_ids[] = {
@@ -183,7 +183,7 @@ U_BOOT_DRIVER(intel_apl_pinctrl) = {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.bind		= dm_scan_fdt_dev,
 #endif
-	.ofdata_to_platdata = apl_pinctrl_ofdata_to_platdata,
+	.of_to_plat = apl_pinctrl_of_to_plat,
 	.priv_auto	= sizeof(struct intel_pinctrl_priv),
 	.plat_auto	= sizeof(struct apl_gpio_platdata),
 };
diff --git a/drivers/pinctrl/mtmips/pinctrl-mt7628.c b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
index 8edab2f9950..c15da6be0ea 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mt7628.c
+++ b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
@@ -534,7 +534,7 @@ static int mt7628_pinctrl_probe(struct udevice *dev)
 	return ret;
 }
 
-static int mt7628_pinctrl_ofdata_to_platdata(struct udevice *dev)
+static int mt7628_pinctrl_of_to_plat(struct udevice *dev)
 {
 	struct mt7628_pinctrl_priv *priv = dev_get_priv(dev);
 
@@ -578,7 +578,7 @@ U_BOOT_DRIVER(mt7628_pinctrl) = {
 	.name = "mt7628-pinctrl",
 	.id = UCLASS_PINCTRL,
 	.of_match = mt7628_pinctrl_ids,
-	.ofdata_to_platdata = mt7628_pinctrl_ofdata_to_platdata,
+	.of_to_plat = mt7628_pinctrl_of_to_plat,
 	.ops = &mt7628_pinctrl_ops,
 	.probe = mt7628_pinctrl_probe,
 	.priv_auto	= sizeof(struct mt7628_pinctrl_priv),
diff --git a/drivers/pinctrl/pinctrl-qe-io.c b/drivers/pinctrl/pinctrl-qe-io.c
index 4f7cfaa0785..5093a52017e 100644
--- a/drivers/pinctrl/pinctrl-qe-io.c
+++ b/drivers/pinctrl/pinctrl-qe-io.c
@@ -120,7 +120,7 @@ void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int assign)
 	qe_cfg_iopin(par_io, port, pin, dir, open_drain, assign);
 }
 #else
-static int qe_io_ofdata_to_platdata(struct udevice *dev)
+static int qe_io_of_to_plat(struct udevice *dev)
 {
 	struct qe_io_platdata *plat = dev->plat;
 	fdt_addr_t addr;
@@ -245,7 +245,7 @@ U_BOOT_DRIVER(par_io_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(par_io_pinctrl_match),
 	.probe = par_io_pinctrl_probe,
-	.ofdata_to_platdata = qe_io_ofdata_to_platdata,
+	.of_to_plat = qe_io_of_to_plat,
 	.plat_auto	= sizeof(struct qe_io_platdata),
 	.ops = &par_io_pinctrl_ops,
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 0a3319cce86..25d646a26f7 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -148,7 +148,7 @@ static int single_set_state(struct udevice *dev,
 	return len;
 }
 
-static int single_ofdata_to_platdata(struct udevice *dev)
+static int single_of_to_plat(struct udevice *dev)
 {
 	fdt_addr_t addr;
 	u32 of_reg[2];
@@ -192,5 +192,5 @@ U_BOOT_DRIVER(single_pinctrl) = {
 	.of_match = single_pinctrl_match,
 	.ops = &single_pinctrl_ops,
 	.plat_auto	= sizeof(struct single_pdata),
-	.ofdata_to_platdata = single_ofdata_to_platdata,
+	.of_to_plat = single_of_to_plat,
 };
diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c
index c97dfbb1c2e..cf6e068f324 100644
--- a/drivers/power/domain/imx8-power-domain-legacy.c
+++ b/drivers/power/domain/imx8-power-domain-legacy.c
@@ -340,7 +340,7 @@ static int imx8_power_domain_probe(struct udevice *dev)
 	return 0;
 }
 
-static int imx8_power_domain_ofdata_to_platdata(struct udevice *dev)
+static int imx8_power_domain_of_to_plat(struct udevice *dev)
 {
 	int reg;
 	struct imx8_power_domain_platdata *pdata = dev_get_plat(dev);
@@ -376,7 +376,7 @@ U_BOOT_DRIVER(imx8_power_domain) = {
 	.of_match = imx8_power_domain_ids,
 	.bind = imx8_power_domain_bind,
 	.probe = imx8_power_domain_probe,
-	.ofdata_to_platdata = imx8_power_domain_ofdata_to_platdata,
+	.of_to_plat = imx8_power_domain_of_to_plat,
 	.plat_auto	= sizeof(struct imx8_power_domain_platdata),
 	.priv_auto	= sizeof(struct imx8_power_domain_priv),
 	.ops = &imx8_power_domain_ops,
diff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx8m-power-domain.c
index 1248f937eb4..499788967c9 100644
--- a/drivers/power/domain/imx8m-power-domain.c
+++ b/drivers/power/domain/imx8m-power-domain.c
@@ -104,7 +104,7 @@ static int imx8m_power_domain_probe(struct udevice *dev)
 	return 0;
 }
 
-static int imx8m_power_domain_ofdata_to_platdata(struct udevice *dev)
+static int imx8m_power_domain_of_to_plat(struct udevice *dev)
 {
 	struct imx8m_power_domain_platdata *pdata = dev_get_plat(dev);
 
@@ -136,7 +136,7 @@ U_BOOT_DRIVER(imx8m_power_domain) = {
 	.of_match = imx8m_power_domain_ids,
 	.bind = imx8m_power_domain_bind,
 	.probe = imx8m_power_domain_probe,
-	.ofdata_to_platdata = imx8m_power_domain_ofdata_to_platdata,
+	.of_to_plat = imx8m_power_domain_of_to_plat,
 	.plat_auto	= sizeof(struct imx8m_power_domain_platdata),
 	.ops = &imx8m_power_domain_ops,
 };
diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c
index a85de822b3c..abe3a1051f1 100644
--- a/drivers/power/pmic/i2c_pmic_emul.c
+++ b/drivers/power/pmic/i2c_pmic_emul.c
@@ -103,7 +103,7 @@ static int sandbox_i2c_pmic_xfer(struct udevice *emul, struct i2c_msg *msg,
 	return ret;
 }
 
-static int sandbox_i2c_pmic_ofdata_to_platdata(struct udevice *emul)
+static int sandbox_i2c_pmic_of_to_plat(struct udevice *emul)
 {
 	struct sandbox_i2c_pmic_plat_data *plat = dev_get_plat(emul);
 	struct udevice *pmic_dev = i2c_emul_get_device(emul);
@@ -159,7 +159,7 @@ U_BOOT_DRIVER(sandbox_i2c_pmic_emul) = {
 	.name		= "sandbox_i2c_pmic_emul",
 	.id		= UCLASS_I2C_EMUL,
 	.of_match	= sandbox_i2c_pmic_ids,
-	.ofdata_to_platdata = sandbox_i2c_pmic_ofdata_to_platdata,
+	.of_to_plat = sandbox_i2c_pmic_of_to_plat,
 	.probe		= sandbox_i2c_pmic_probe,
 	.plat_auto	= sizeof(struct sandbox_i2c_pmic_plat_data),
 	.ops		= &sandbox_i2c_pmic_emul_ops,
diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c
index 02a08b58b06..fcd1d5292cc 100644
--- a/drivers/power/regulator/fan53555.c
+++ b/drivers/power/regulator/fan53555.c
@@ -100,7 +100,7 @@ struct fan53555_priv {
 	unsigned int sleep_vol_cache;
 };
 
-static int fan53555_regulator_ofdata_to_platdata(struct udevice *dev)
+static int fan53555_regulator_of_to_plat(struct udevice *dev)
 {
 	struct fan53555_platdata *dev_pdata = dev_get_plat(dev);
 	struct dm_regulator_uclass_plat *uc_pdata =
@@ -238,7 +238,7 @@ U_BOOT_DRIVER(fan53555_regulator) = {
 	.name = "fan53555_regulator",
 	.id = UCLASS_REGULATOR,
 	.ops = &fan53555_regulator_ops,
-	.ofdata_to_platdata = fan53555_regulator_ofdata_to_platdata,
+	.of_to_plat = fan53555_regulator_of_to_plat,
 	.plat_auto	= sizeof(struct fan53555_platdata),
 	.priv_auto	= sizeof(struct fan53555_priv),
 	.probe = fan53555_probe,
diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c
index 4967b7051b3..efe2ec9a164 100644
--- a/drivers/power/regulator/fixed.c
+++ b/drivers/power/regulator/fixed.c
@@ -14,7 +14,7 @@
 
 #include "regulator_common.h"
 
-static int fixed_regulator_ofdata_to_platdata(struct udevice *dev)
+static int fixed_regulator_of_to_plat(struct udevice *dev)
 {
 	struct dm_regulator_uclass_plat *uc_pdata;
 	struct regulator_common_platdata *dev_pdata;
@@ -26,7 +26,7 @@ static int fixed_regulator_ofdata_to_platdata(struct udevice *dev)
 
 	uc_pdata->type = REGULATOR_TYPE_FIXED;
 
-	return regulator_common_ofdata_to_platdata(dev, dev_pdata, "gpio");
+	return regulator_common_of_to_plat(dev, dev_pdata, "gpio");
 }
 
 static int fixed_regulator_get_value(struct udevice *dev)
@@ -88,6 +88,6 @@ U_BOOT_DRIVER(regulator_fixed) = {
 	.id = UCLASS_REGULATOR,
 	.ops = &fixed_regulator_ops,
 	.of_match = fixed_regulator_ids,
-	.ofdata_to_platdata = fixed_regulator_ofdata_to_platdata,
+	.of_to_plat = fixed_regulator_of_to_plat,
 	.plat_auto	= sizeof(struct regulator_common_platdata),
 };
diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c
index 80a6949e6b3..2565c4416a8 100644
--- a/drivers/power/regulator/gpio-regulator.c
+++ b/drivers/power/regulator/gpio-regulator.c
@@ -25,7 +25,7 @@ struct gpio_regulator_platdata {
 	int voltages[GPIO_REGULATOR_MAX_STATES];
 };
 
-static int gpio_regulator_ofdata_to_platdata(struct udevice *dev)
+static int gpio_regulator_of_to_plat(struct udevice *dev)
 {
 	struct dm_regulator_uclass_plat *uc_pdata;
 	struct gpio_regulator_platdata *dev_pdata;
@@ -74,7 +74,7 @@ static int gpio_regulator_ofdata_to_platdata(struct udevice *dev)
 		j++;
 	}
 
-	return regulator_common_ofdata_to_platdata(dev, &dev_pdata->common, "enable-gpios");
+	return regulator_common_of_to_plat(dev, &dev_pdata->common, "enable-gpios");
 }
 
 static int gpio_regulator_get_value(struct udevice *dev)
@@ -154,6 +154,6 @@ U_BOOT_DRIVER(gpio_regulator) = {
 	.id = UCLASS_REGULATOR,
 	.ops = &gpio_regulator_ops,
 	.of_match = gpio_regulator_ids,
-	.ofdata_to_platdata = gpio_regulator_ofdata_to_platdata,
+	.of_to_plat = gpio_regulator_of_to_plat,
 	.plat_auto	= sizeof(struct gpio_regulator_platdata),
 };
diff --git a/drivers/power/regulator/pbias_regulator.c b/drivers/power/regulator/pbias_regulator.c
index c01c19efbe6..c3df156749f 100644
--- a/drivers/power/regulator/pbias_regulator.c
+++ b/drivers/power/regulator/pbias_regulator.c
@@ -64,7 +64,7 @@ static int pbias_read(struct udevice *dev, uint reg, uint8_t *buff, int len)
 	return regmap_read(priv->regmap, priv->offset, (u32 *)buff);
 }
 
-static int pbias_ofdata_to_platdata(struct udevice *dev)
+static int pbias_of_to_plat(struct udevice *dev)
 {
 	struct pbias_priv *priv = dev_get_priv(dev);
 	struct udevice *syscon;
@@ -129,7 +129,7 @@ U_BOOT_DRIVER(pbias_pmic) = {
 	.of_match = pbias_ids,
 	.bind = pbias_bind,
 	.ops = &pbias_ops,
-	.ofdata_to_platdata = pbias_ofdata_to_platdata,
+	.of_to_plat = pbias_of_to_plat,
 	.priv_auto	= sizeof(struct pbias_priv),
 };
 
diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c
index 9435cc3162f..18e57db0763 100644
--- a/drivers/power/regulator/pwm_regulator.c
+++ b/drivers/power/regulator/pwm_regulator.c
@@ -89,7 +89,7 @@ static int pwm_regulator_set_voltage(struct udevice *dev, int uvolt)
 	return ret;
 }
 
-static int pwm_regulator_ofdata_to_platdata(struct udevice *dev)
+static int pwm_regulator_of_to_plat(struct udevice *dev)
 {
 	struct pwm_regulator_info *priv = dev_get_priv(dev);
 	struct ofnode_phandle_args args;
@@ -154,6 +154,6 @@ U_BOOT_DRIVER(pwm_regulator) = {
 	.ops = &pwm_regulator_ops,
 	.probe = pwm_regulator_probe,
 	.of_match = pwm_regulator_ids,
-	.ofdata_to_platdata	= pwm_regulator_ofdata_to_platdata,
+	.of_to_plat	= pwm_regulator_of_to_plat,
 	.priv_auto	= sizeof(struct pwm_regulator_info),
 };
diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c
index 13906b9c6e2..d307a1948a0 100644
--- a/drivers/power/regulator/regulator_common.c
+++ b/drivers/power/regulator/regulator_common.c
@@ -12,8 +12,9 @@
 
 #include "regulator_common.h"
 
-int regulator_common_ofdata_to_platdata(struct udevice *dev,
-	struct regulator_common_platdata *dev_pdata, const char *enable_gpio_name)
+int regulator_common_of_to_plat(struct udevice *dev,
+				struct regulator_common_platdata *dev_pdata,
+				const char *enable_gpio_name)
 {
 	struct gpio_desc *gpio;
 	int flags = GPIOD_IS_OUT;
diff --git a/drivers/power/regulator/regulator_common.h b/drivers/power/regulator/regulator_common.h
index bf80439c786..5ae0b9aa40b 100644
--- a/drivers/power/regulator/regulator_common.h
+++ b/drivers/power/regulator/regulator_common.h
@@ -15,8 +15,9 @@ struct regulator_common_platdata {
 	unsigned int off_on_delay_us;
 };
 
-int regulator_common_ofdata_to_platdata(struct udevice *dev,
-	struct regulator_common_platdata *dev_pdata, const char *enable_gpio_name);
+int regulator_common_of_to_plat(struct udevice *dev,
+				struct regulator_common_platdata *dev_pdata,
+				const char *enable_gpio_name);
 int regulator_common_get_enable(const struct udevice *dev,
 	struct regulator_common_platdata *dev_pdata);
 int regulator_common_set_enable(const struct udevice *dev,
diff --git a/drivers/power/regulator/tps65910_regulator.c b/drivers/power/regulator/tps65910_regulator.c
index 9fb13d6a551..0ed4952a1e0 100644
--- a/drivers/power/regulator/tps65910_regulator.c
+++ b/drivers/power/regulator/tps65910_regulator.c
@@ -386,7 +386,7 @@ static int tps65910_boost_get_value(struct udevice *dev)
 	return vout;
 }
 
-static int tps65910_regulator_ofdata_to_platdata(struct udevice *dev)
+static int tps65910_regulator_of_to_plat(struct udevice *dev)
 {
 	struct udevice *supply;
 	int ret;
@@ -425,7 +425,7 @@ U_BOOT_DRIVER(tps65910_boost) = {
 	.id = UCLASS_REGULATOR,
 	.ops = &tps65910_boost_ops,
 	.plat_auto	= sizeof(struct tps65910_regulator_pdata),
-	.ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata,
+	.of_to_plat = tps65910_regulator_of_to_plat,
 };
 
 static const struct dm_regulator_ops tps65910_buck_ops = {
@@ -440,7 +440,7 @@ U_BOOT_DRIVER(tps65910_buck) = {
 	.id = UCLASS_REGULATOR,
 	.ops = &tps65910_buck_ops,
 	.plat_auto	= sizeof(struct tps65910_regulator_pdata),
-	.ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata,
+	.of_to_plat = tps65910_regulator_of_to_plat,
 };
 
 static const struct dm_regulator_ops tps65910_ldo_ops = {
@@ -455,5 +455,5 @@ U_BOOT_DRIVER(tps65910_ldo) = {
 	.id = UCLASS_REGULATOR,
 	.ops = &tps65910_ldo_ops,
 	.plat_auto	= sizeof(struct tps65910_regulator_pdata),
-	.ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata,
+	.of_to_plat = tps65910_regulator_of_to_plat,
 };
diff --git a/drivers/pwm/exynos_pwm.c b/drivers/pwm/exynos_pwm.c
index 70fbdf89bd0..1afaf784dab 100644
--- a/drivers/pwm/exynos_pwm.c
+++ b/drivers/pwm/exynos_pwm.c
@@ -88,7 +88,7 @@ static int exynos_pwm_probe(struct udevice *dev)
 	return 0;
 }
 
-static int exynos_pwm_ofdata_to_platdata(struct udevice *dev)
+static int exynos_pwm_of_to_plat(struct udevice *dev)
 {
 	struct exynos_pwm_priv *priv = dev_get_priv(dev);
 
@@ -113,6 +113,6 @@ U_BOOT_DRIVER(exynos_pwm) = {
 	.of_match = exynos_channels,
 	.ops	= &exynos_pwm_ops,
 	.probe	= exynos_pwm_probe,
-	.ofdata_to_platdata	= exynos_pwm_ofdata_to_platdata,
+	.of_to_plat	= exynos_pwm_of_to_plat,
 	.priv_auto	= sizeof(struct exynos_pwm_priv),
 };
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 0b8e82b6fae..2008c1520e6 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -126,7 +126,7 @@ static int imx_pwm_set_enable(struct udevice *dev, uint channel, bool enable)
 	return 0;
 };
 
-static int imx_pwm_ofdata_to_platdata(struct udevice *dev)
+static int imx_pwm_of_to_plat(struct udevice *dev)
 {
 	struct imx_pwm_priv *priv = dev_get_priv(dev);
 
@@ -156,7 +156,7 @@ U_BOOT_DRIVER(imx_pwm) = {
 	.id	= UCLASS_PWM,
 	.of_match = imx_pwm_ids,
 	.ops	= &imx_pwm_ops,
-	.ofdata_to_platdata	= imx_pwm_ofdata_to_platdata,
+	.of_to_plat	= imx_pwm_of_to_plat,
 	.probe		= imx_pwm_probe,
 	.priv_auto	= sizeof(struct imx_pwm_priv),
 };
diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c
index e538e27e136..58b7469f977 100644
--- a/drivers/pwm/pwm-meson.c
+++ b/drivers/pwm/pwm-meson.c
@@ -249,7 +249,7 @@ static int meson_pwm_set_invert(struct udevice *dev, uint channeln, bool polarit
 	return meson_pwm_set_config(dev, channeln, channel->period_ns, channel->duty_ns);
 }
 
-static int meson_pwm_ofdata_to_platdata(struct udevice *dev)
+static int meson_pwm_of_to_plat(struct udevice *dev)
 {
 	struct meson_pwm *priv = dev_get_priv(dev);
 
@@ -522,7 +522,7 @@ U_BOOT_DRIVER(meson_pwm) = {
 	.id	= UCLASS_PWM,
 	.of_match = meson_pwm_ids,
 	.ops	= &meson_pwm_ops,
-	.ofdata_to_platdata = meson_pwm_ofdata_to_platdata,
+	.of_to_plat = meson_pwm_of_to_plat,
 	.probe	 = meson_pwm_probe,
 	.priv_auto	= sizeof(struct meson_pwm),
 };
diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c
index 4731e4a1858..30c30430bea 100644
--- a/drivers/pwm/pwm-sifive.c
+++ b/drivers/pwm/pwm-sifive.c
@@ -115,7 +115,7 @@ static int pwm_sifive_set_enable(struct udevice *dev, uint channel, bool enable)
 	return 0;
 }
 
-static int pwm_sifive_ofdata_to_platdata(struct udevice *dev)
+static int pwm_sifive_of_to_plat(struct udevice *dev)
 {
 	struct pwm_sifive_priv *priv = dev_get_priv(dev);
 
@@ -166,7 +166,7 @@ U_BOOT_DRIVER(pwm_sifive) = {
 	.id	= UCLASS_PWM,
 	.of_match = pwm_sifive_ids,
 	.ops	= &pwm_sifive_ops,
-	.ofdata_to_platdata     = pwm_sifive_ofdata_to_platdata,
+	.of_to_plat     = pwm_sifive_of_to_plat,
 	.probe		= pwm_sifive_probe,
 	.priv_auto	= sizeof(struct pwm_sifive_priv),
 };
diff --git a/drivers/pwm/rk_pwm.c b/drivers/pwm/rk_pwm.c
index ccd23d88849..a64fc4a0527 100644
--- a/drivers/pwm/rk_pwm.c
+++ b/drivers/pwm/rk_pwm.c
@@ -121,7 +121,7 @@ static int rk_pwm_set_enable(struct udevice *dev, uint channel, bool enable)
 	return 0;
 }
 
-static int rk_pwm_ofdata_to_platdata(struct udevice *dev)
+static int rk_pwm_of_to_plat(struct udevice *dev)
 {
 	struct rk_pwm_priv *priv = dev_get_priv(dev);
 
@@ -213,7 +213,7 @@ U_BOOT_DRIVER(rk_pwm) = {
 	.id	= UCLASS_PWM,
 	.of_match = rk_pwm_ids,
 	.ops	= &rk_pwm_ops,
-	.ofdata_to_platdata	= rk_pwm_ofdata_to_platdata,
+	.of_to_plat	= rk_pwm_of_to_plat,
 	.probe		= rk_pwm_probe,
 	.priv_auto	= sizeof(struct rk_pwm_priv),
 };
diff --git a/drivers/pwm/sunxi_pwm.c b/drivers/pwm/sunxi_pwm.c
index 9a35fe02def..614635526fe 100644
--- a/drivers/pwm/sunxi_pwm.c
+++ b/drivers/pwm/sunxi_pwm.c
@@ -148,7 +148,7 @@ static int sunxi_pwm_set_enable(struct udevice *dev, uint channel, bool enable)
 	return 0;
 }
 
-static int sunxi_pwm_ofdata_to_platdata(struct udevice *dev)
+static int sunxi_pwm_of_to_plat(struct udevice *dev)
 {
 	struct sunxi_pwm_priv *priv = dev_get_priv(dev);
 
@@ -179,7 +179,7 @@ U_BOOT_DRIVER(sunxi_pwm) = {
 	.id	= UCLASS_PWM,
 	.of_match = sunxi_pwm_ids,
 	.ops	= &sunxi_pwm_ops,
-	.ofdata_to_platdata	= sunxi_pwm_ofdata_to_platdata,
+	.of_to_plat	= sunxi_pwm_of_to_plat,
 	.probe		= sunxi_pwm_probe,
 	.priv_auto	= sizeof(struct sunxi_pwm_priv),
 };
diff --git a/drivers/pwm/tegra_pwm.c b/drivers/pwm/tegra_pwm.c
index 29c9ce366c9..36c35c608b2 100644
--- a/drivers/pwm/tegra_pwm.c
+++ b/drivers/pwm/tegra_pwm.c
@@ -53,7 +53,7 @@ static int tegra_pwm_set_enable(struct udevice *dev, uint channel, bool enable)
 	return 0;
 }
 
-static int tegra_pwm_ofdata_to_platdata(struct udevice *dev)
+static int tegra_pwm_of_to_plat(struct udevice *dev)
 {
 	struct tegra_pwm_priv *priv = dev_get_priv(dev);
 
@@ -78,6 +78,6 @@ U_BOOT_DRIVER(tegra_pwm) = {
 	.id	= UCLASS_PWM,
 	.of_match = tegra_pwm_ids,
 	.ops	= &tegra_pwm_ops,
-	.ofdata_to_platdata	= tegra_pwm_ofdata_to_platdata,
+	.of_to_plat	= tegra_pwm_of_to_plat,
 	.priv_auto	= sizeof(struct tegra_pwm_priv),
 };
diff --git a/drivers/ram/aspeed/sdram_ast2500.c b/drivers/ram/aspeed/sdram_ast2500.c
index e4d01d848ee..905ef304e25 100644
--- a/drivers/ram/aspeed/sdram_ast2500.c
+++ b/drivers/ram/aspeed/sdram_ast2500.c
@@ -386,7 +386,7 @@ static int ast2500_sdrammc_probe(struct udevice *dev)
 	return 0;
 }
 
-static int ast2500_sdrammc_ofdata_to_platdata(struct udevice *dev)
+static int ast2500_sdrammc_of_to_plat(struct udevice *dev)
 {
 	struct dram_info *priv = dev_get_priv(dev);
 	struct regmap *map;
@@ -433,7 +433,7 @@ U_BOOT_DRIVER(sdrammc_ast2500) = {
 	.id = UCLASS_RAM,
 	.of_match = ast2500_sdrammc_ids,
 	.ops = &ast2500_sdrammc_ops,
-	.ofdata_to_platdata = ast2500_sdrammc_ofdata_to_platdata,
+	.of_to_plat = ast2500_sdrammc_of_to_plat,
 	.probe = ast2500_sdrammc_probe,
 	.priv_auto	= sizeof(struct dram_info),
 };
diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c
index 6a5d96ff724..ca2eec767d7 100644
--- a/drivers/ram/imxrt_sdram.c
+++ b/drivers/ram/imxrt_sdram.c
@@ -302,7 +302,7 @@ int imxrt_sdram_init(struct udevice *dev)
 	return 0;
 }
 
-static int imxrt_semc_ofdata_to_platdata(struct udevice *dev)
+static int imxrt_semc_of_to_plat(struct udevice *dev)
 {
 	struct imxrt_sdram_params *params = dev_get_plat(dev);
 	ofnode bank_node;
@@ -439,7 +439,7 @@ U_BOOT_DRIVER(imxrt_semc) = {
 	.id = UCLASS_RAM,
 	.of_match = imxrt_semc_ids,
 	.ops = &imxrt_semc_ops,
-	.ofdata_to_platdata = imxrt_semc_ofdata_to_platdata,
+	.of_to_plat = imxrt_semc_of_to_plat,
 	.probe = imxrt_semc_probe,
 	.plat_auto	= sizeof(struct imxrt_sdram_params),
 };
diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c
index 87294430bf9..783834c9f57 100644
--- a/drivers/ram/mpc83xx_sdram.c
+++ b/drivers/ram/mpc83xx_sdram.c
@@ -305,7 +305,7 @@ static int mpc83xx_sdram_spd_init(ofnode node, u32 cs, u32 mapaddr, u32 size)
 	return 0;
 }
 
-static int mpc83xx_sdram_ofdata_to_platdata(struct udevice *dev)
+static int mpc83xx_sdram_of_to_plat(struct udevice *dev)
 {
 	return 0;
 }
@@ -1093,7 +1093,7 @@ U_BOOT_DRIVER(mpc83xx_sdram) = {
 	.id = UCLASS_RAM,
 	.of_match = mpc83xx_sdram_ids,
 	.ops = &mpc83xx_sdram_ops,
-	.ofdata_to_platdata = mpc83xx_sdram_ofdata_to_platdata,
+	.of_to_plat = mpc83xx_sdram_of_to_plat,
 	.probe = mpc83xx_sdram_probe,
 	.priv_auto	= sizeof(struct mpc83xx_sdram_priv),
 };
diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c
index 1a19964b8fe..0e677f3ec78 100644
--- a/drivers/ram/rockchip/dmc-rk3368.c
+++ b/drivers/ram/rockchip/dmc-rk3368.c
@@ -879,7 +879,7 @@ error:
 }
 #endif
 
-static int rk3368_dmc_ofdata_to_platdata(struct udevice *dev)
+static int rk3368_dmc_of_to_plat(struct udevice *dev)
 {
 	int ret = 0;
 
@@ -999,7 +999,7 @@ U_BOOT_DRIVER(rockchip_rk3368_dmc) = {
 	.ops = &rk3368_dmc_ops,
 	.probe = rk3368_dmc_probe,
 	.priv_auto	= sizeof(struct dram_info),
-	.ofdata_to_platdata = rk3368_dmc_ofdata_to_platdata,
+	.of_to_plat = rk3368_dmc_of_to_plat,
 	.probe = rk3368_dmc_probe,
 	.priv_auto	= sizeof(struct dram_info),
 	.plat_auto	= sizeof(struct rk3368_sdram_params),
diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c
index e7ba0b98358..d0b0601fbe6 100644
--- a/drivers/ram/rockchip/sdram_rk3188.c
+++ b/drivers/ram/rockchip/sdram_rk3188.c
@@ -814,7 +814,7 @@ static int setup_sdram(struct udevice *dev)
 	return sdram_init(priv, params);
 }
 
-static int rk3188_dmc_ofdata_to_platdata(struct udevice *dev)
+static int rk3188_dmc_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct rk3188_sdram_params *params = dev_get_plat(dev);
@@ -951,7 +951,7 @@ U_BOOT_DRIVER(rockchip_rk3188_dmc) = {
 	.of_match = rk3188_dmc_ids,
 	.ops = &rk3188_dmc_ops,
 #ifdef CONFIG_SPL_BUILD
-	.ofdata_to_platdata = rk3188_dmc_ofdata_to_platdata,
+	.of_to_plat = rk3188_dmc_of_to_plat,
 #endif
 	.probe = rk3188_dmc_probe,
 	.priv_auto	= sizeof(struct dram_info),
diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c
index 763c8509c52..bdc463c1d76 100644
--- a/drivers/ram/rockchip/sdram_rk322x.c
+++ b/drivers/ram/rockchip/sdram_rk322x.c
@@ -713,7 +713,7 @@ out:
 	return ret;
 }
 
-static int rk322x_dmc_ofdata_to_platdata(struct udevice *dev)
+static int rk322x_dmc_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct rk322x_sdram_params *params = dev_get_plat(dev);
@@ -844,7 +844,7 @@ U_BOOT_DRIVER(dmc_rk322x) = {
 	.of_match = rk322x_dmc_ids,
 	.ops = &rk322x_dmc_ops,
 #ifdef CONFIG_TPL_BUILD
-	.ofdata_to_platdata = rk322x_dmc_ofdata_to_platdata,
+	.of_to_plat = rk322x_dmc_of_to_plat,
 #endif
 	.probe = rk322x_dmc_probe,
 	.priv_auto	= sizeof(struct dram_info),
diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c
index 44ad28ab755..094ae36c884 100644
--- a/drivers/ram/rockchip/sdram_rk3288.c
+++ b/drivers/ram/rockchip/sdram_rk3288.c
@@ -971,7 +971,7 @@ static int setup_sdram(struct udevice *dev)
 	return sdram_init(priv, params);
 }
 
-static int rk3288_dmc_ofdata_to_platdata(struct udevice *dev)
+static int rk3288_dmc_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct rk3288_sdram_params *params = dev_get_plat(dev);
@@ -1120,7 +1120,7 @@ U_BOOT_DRIVER(rockchip_rk3288_dmc) = {
 	.ops = &rk3288_dmc_ops,
 #if defined(CONFIG_TPL_BUILD) || \
 	(!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD))
-	.ofdata_to_platdata = rk3288_dmc_ofdata_to_platdata,
+	.of_to_plat = rk3288_dmc_of_to_plat,
 #endif
 	.probe = rk3288_dmc_probe,
 	.priv_auto	= sizeof(struct dram_info),
diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c
index 994a948f342..cfd351501a3 100644
--- a/drivers/ram/rockchip/sdram_rk3328.c
+++ b/drivers/ram/rockchip/sdram_rk3328.c
@@ -548,7 +548,7 @@ static int rk3328_dmc_init(struct udevice *dev)
 	return 0;
 }
 
-static int rk3328_dmc_ofdata_to_platdata(struct udevice *dev)
+static int rk3328_dmc_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct rockchip_dmc_plat *plat = dev_get_plat(dev);
@@ -612,7 +612,7 @@ U_BOOT_DRIVER(rockchip_rk3328_dmc) = {
 	.of_match = rk3328_dmc_ids,
 	.ops = &rk3328_dmc_ops,
 #ifdef CONFIG_TPL_BUILD
-	.ofdata_to_platdata = rk3328_dmc_ofdata_to_platdata,
+	.of_to_plat = rk3328_dmc_of_to_plat,
 #endif
 	.probe = rk3328_dmc_probe,
 	.priv_auto	= sizeof(struct dram_info),
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index 07977bc1d40..261ded0760e 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -3011,7 +3011,7 @@ static int sdram_init(struct dram_info *dram,
 	return 0;
 }
 
-static int rk3399_dmc_ofdata_to_platdata(struct udevice *dev)
+static int rk3399_dmc_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct rockchip_dmc_plat *plat = dev_get_plat(dev);
@@ -3175,7 +3175,7 @@ U_BOOT_DRIVER(dmc_rk3399) = {
 	.ops = &rk3399_dmc_ops,
 #if defined(CONFIG_TPL_BUILD) || \
 	(!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD))
-	.ofdata_to_platdata = rk3399_dmc_ofdata_to_platdata,
+	.of_to_plat = rk3399_dmc_of_to_plat,
 #endif
 	.probe = rk3399_dmc_probe,
 	.priv_auto	= sizeof(struct dram_info),
diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c
index da25d37a0c2..4003db0e503 100644
--- a/drivers/ram/stm32_sdram.c
+++ b/drivers/ram/stm32_sdram.c
@@ -256,7 +256,7 @@ int stm32_sdram_init(struct udevice *dev)
 	return 0;
 }
 
-static int stm32_fmc_ofdata_to_platdata(struct udevice *dev)
+static int stm32_fmc_of_to_plat(struct udevice *dev)
 {
 	struct stm32_sdram_params *params = dev_get_plat(dev);
 	struct bank_params *bank_params;
@@ -407,7 +407,7 @@ U_BOOT_DRIVER(stm32_fmc) = {
 	.id = UCLASS_RAM,
 	.of_match = stm32_fmc_ids,
 	.ops = &stm32_fmc_ops,
-	.ofdata_to_platdata = stm32_fmc_ofdata_to_platdata,
+	.of_to_plat = stm32_fmc_of_to_plat,
 	.probe = stm32_fmc_probe,
 	.plat_auto	= sizeof(struct stm32_sdram_params),
 };
diff --git a/drivers/reset/reset-mtmips.c b/drivers/reset/reset-mtmips.c
index 18a4ecad4f0..848425afbcb 100644
--- a/drivers/reset/reset-mtmips.c
+++ b/drivers/reset/reset-mtmips.c
@@ -58,7 +58,7 @@ static int mtmips_reset_probe(struct udevice *dev)
 	return 0;
 }
 
-static int mtmips_reset_ofdata_to_platdata(struct udevice *dev)
+static int mtmips_reset_of_to_plat(struct udevice *dev)
 {
 	struct mtmips_reset_priv *priv = dev_get_priv(dev);
 
@@ -78,7 +78,7 @@ U_BOOT_DRIVER(mtmips_reset) = {
 	.name = "mtmips-reset",
 	.id = UCLASS_RESET,
 	.of_match = mtmips_reset_ids,
-	.ofdata_to_platdata = mtmips_reset_ofdata_to_platdata,
+	.of_to_plat = mtmips_reset_of_to_plat,
 	.probe = mtmips_reset_probe,
 	.priv_auto	= sizeof(struct mtmips_reset_priv),
 	.ops = &mtmips_reset_ops,
diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c
index 1d0b540b7b4..bebfce40a63 100644
--- a/drivers/rng/meson-rng.c
+++ b/drivers/rng/meson-rng.c
@@ -76,12 +76,12 @@ static int meson_rng_remove(struct udevice *dev)
 }
 
 /**
- * meson_rng_ofdata_to_platdata() - transfer device tree data to plaform data
+ * meson_rng_of_to_plat() - transfer device tree data to plaform data
  *
  * @dev:	device
  * Return:	0 if ok
  */
-static int meson_rng_ofdata_to_platdata(struct udevice *dev)
+static int meson_rng_of_to_plat(struct udevice *dev)
 {
 	struct meson_rng_platdata *pdata = dev_get_plat(dev);
 	int err;
@@ -117,5 +117,5 @@ U_BOOT_DRIVER(meson_rng) = {
 	.probe = meson_rng_probe,
 	.remove = meson_rng_remove,
 	.plat_auto	= sizeof(struct meson_rng_platdata),
-	.ofdata_to_platdata = meson_rng_ofdata_to_platdata,
+	.of_to_plat = meson_rng_of_to_plat,
 };
diff --git a/drivers/rng/rockchip_rng.c b/drivers/rng/rockchip_rng.c
index 7c4363f7992..ec233d13211 100644
--- a/drivers/rng/rockchip_rng.c
+++ b/drivers/rng/rockchip_rng.c
@@ -168,7 +168,7 @@ exit:
 	return ret;
 }
 
-static int rockchip_rng_ofdata_to_platdata(struct udevice *dev)
+static int rockchip_rng_of_to_plat(struct udevice *dev)
 {
 	struct rk_rng_platdata *pdata = dev_get_priv(dev);
 
@@ -220,6 +220,6 @@ U_BOOT_DRIVER(rockchip_rng) = {
 	.of_match = rockchip_rng_match,
 	.ops = &rockchip_rng_ops,
 	.probe = rockchip_rng_probe,
-	.ofdata_to_platdata = rockchip_rng_ofdata_to_platdata,
+	.of_to_plat = rockchip_rng_of_to_plat,
 	.priv_auto	= sizeof(struct rk_rng_platdata),
 };
diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c
index 34281d39464..30505ee7fc6 100644
--- a/drivers/rng/stm32mp1_rng.c
+++ b/drivers/rng/stm32mp1_rng.c
@@ -122,7 +122,7 @@ static int stm32_rng_remove(struct udevice *dev)
 	return stm32_rng_cleanup(pdata);
 }
 
-static int stm32_rng_ofdata_to_platdata(struct udevice *dev)
+static int stm32_rng_of_to_plat(struct udevice *dev)
 {
 	struct stm32_rng_platdata *pdata = dev_get_plat(dev);
 	int err;
@@ -161,5 +161,5 @@ U_BOOT_DRIVER(stm32_rng) = {
 	.probe = stm32_rng_probe,
 	.remove = stm32_rng_remove,
 	.plat_auto	= sizeof(struct stm32_rng_platdata),
-	.ofdata_to_platdata = stm32_rng_ofdata_to_platdata,
+	.of_to_plat = stm32_rng_of_to_plat,
 };
diff --git a/drivers/rtc/mvrtc.c b/drivers/rtc/mvrtc.c
index 731ce8d0592..50240d57fa9 100644
--- a/drivers/rtc/mvrtc.c
+++ b/drivers/rtc/mvrtc.c
@@ -168,7 +168,7 @@ static const struct udevice_id mv_rtc_ids[] = {
 	{ }
 };
 
-static int mv_rtc_ofdata_to_platdata(struct udevice *dev)
+static int mv_rtc_of_to_plat(struct udevice *dev)
 {
 	struct mvrtc_pdata *pdata = dev_get_plat(dev);
 
@@ -179,7 +179,7 @@ static int mv_rtc_ofdata_to_platdata(struct udevice *dev)
 U_BOOT_DRIVER(rtc_mv) = {
 	.name	= "rtc-mv",
 	.id	= UCLASS_RTC,
-	.ofdata_to_platdata = mv_rtc_ofdata_to_platdata,
+	.of_to_plat = mv_rtc_of_to_plat,
 	.of_match = mv_rtc_ids,
 	.ops	= &mv_rtc_ops,
 };
diff --git a/drivers/rtc/pl031.c b/drivers/rtc/pl031.c
index df79c1fb88f..b9797f312ad 100644
--- a/drivers/rtc/pl031.c
+++ b/drivers/rtc/pl031.c
@@ -122,7 +122,7 @@ static const struct udevice_id pl031_ids[] = {
 	{ }
 };
 
-static int pl031_ofdata_to_platdata(struct udevice *dev)
+static int pl031_of_to_plat(struct udevice *dev)
 {
 	struct pl031_platdata *pdata = dev_get_plat(dev);
 
@@ -136,7 +136,7 @@ U_BOOT_DRIVER(rtc_pl031) = {
 	.id	= UCLASS_RTC,
 	.of_match = pl031_ids,
 	.probe	= pl031_probe,
-	.ofdata_to_platdata = pl031_ofdata_to_platdata,
+	.of_to_plat = pl031_of_to_plat,
 	.plat_auto	= sizeof(struct pl031_platdata),
 	.ops	= &pl031_ops,
 };
diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index e855ca472c7..af7fe39e20b 100644
--- a/drivers/serial/altera_jtag_uart.c
+++ b/drivers/serial/altera_jtag_uart.c
@@ -91,7 +91,7 @@ static int altera_jtaguart_probe(struct udevice *dev)
 	return 0;
 }
 
-static int altera_jtaguart_ofdata_to_platdata(struct udevice *dev)
+static int altera_jtaguart_of_to_plat(struct udevice *dev)
 {
 	struct altera_jtaguart_platdata *plat = dev_get_plat(dev);
 
@@ -118,7 +118,7 @@ U_BOOT_DRIVER(altera_jtaguart) = {
 	.name	= "altera_jtaguart",
 	.id	= UCLASS_SERIAL,
 	.of_match = altera_jtaguart_ids,
-	.ofdata_to_platdata = altera_jtaguart_ofdata_to_platdata,
+	.of_to_plat = altera_jtaguart_of_to_plat,
 	.plat_auto	= sizeof(struct altera_jtaguart_platdata),
 	.probe = altera_jtaguart_probe,
 	.ops	= &altera_jtaguart_ops,
diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c
index 8d27382ee33..fe6550551da 100644
--- a/drivers/serial/altera_uart.c
+++ b/drivers/serial/altera_uart.c
@@ -83,7 +83,7 @@ static int altera_uart_probe(struct udevice *dev)
 	return 0;
 }
 
-static int altera_uart_ofdata_to_platdata(struct udevice *dev)
+static int altera_uart_of_to_plat(struct udevice *dev)
 {
 	struct altera_uart_platdata *plat = dev_get_plat(dev);
 
@@ -111,7 +111,7 @@ U_BOOT_DRIVER(altera_uart) = {
 	.name	= "altera_uart",
 	.id	= UCLASS_SERIAL,
 	.of_match = altera_uart_ids,
-	.ofdata_to_platdata = altera_uart_ofdata_to_platdata,
+	.of_to_plat = altera_uart_of_to_plat,
 	.plat_auto	= sizeof(struct altera_uart_platdata),
 	.probe = altera_uart_probe,
 	.ops	= &altera_uart_ops,
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 6bc8c994351..6f80e02a0a6 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -533,7 +533,7 @@ enum {
 #endif
 
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
-int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
+int ns16550_serial_of_to_plat(struct udevice *dev)
 {
 	struct ns16550_platdata *plat = dev->plat;
 	const u32 port_type = dev_get_driver_data(dev);
@@ -610,7 +610,7 @@ U_BOOT_DRIVER(ns16550_serial) = {
 	.id	= UCLASS_SERIAL,
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = ns16550_serial_ids,
-	.ofdata_to_platdata = ns16550_serial_ofdata_to_platdata,
+	.of_to_plat = ns16550_serial_of_to_plat,
 	.plat_auto	= sizeof(struct ns16550_platdata),
 #endif
 	.priv_auto	= sizeof(struct NS16550),
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index 541a1ef970c..48c44c24c61 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -217,7 +217,7 @@ static const char * const ansi_colour[] = {
 	"white",
 };
 
-static int sandbox_serial_ofdata_to_platdata(struct udevice *dev)
+static int sandbox_serial_of_to_plat(struct udevice *dev)
 {
 	struct sandbox_serial_platdata *plat = dev->plat;
 	const char *colour;
@@ -258,7 +258,7 @@ U_BOOT_DRIVER(sandbox_serial) = {
 	.name	= "sandbox_serial",
 	.id	= UCLASS_SERIAL,
 	.of_match = sandbox_serial_ids,
-	.ofdata_to_platdata = sandbox_serial_ofdata_to_platdata,
+	.of_to_plat = sandbox_serial_of_to_plat,
 	.plat_auto	= sizeof(struct sandbox_serial_platdata),
 	.priv_auto	= sizeof(struct sandbox_serial_priv),
 	.probe = sandbox_serial_probe,
diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c
index 8964fa75fc2..dae55ea6f4b 100644
--- a/drivers/serial/serial_arc.c
+++ b/drivers/serial/serial_arc.c
@@ -109,7 +109,7 @@ static const struct udevice_id arc_serial_ids[] = {
 	{ }
 };
 
-static int arc_serial_ofdata_to_platdata(struct udevice *dev)
+static int arc_serial_of_to_plat(struct udevice *dev)
 {
 	struct arc_serial_platdata *plat = dev_get_plat(dev);
 	DECLARE_GLOBAL_DATA_PTR;
@@ -125,7 +125,7 @@ U_BOOT_DRIVER(serial_arc) = {
 	.name	= "serial_arc",
 	.id	= UCLASS_SERIAL,
 	.of_match = arc_serial_ids,
-	.ofdata_to_platdata = arc_serial_ofdata_to_platdata,
+	.of_to_plat = arc_serial_of_to_plat,
 	.plat_auto	= sizeof(struct arc_serial_platdata),
 	.probe = arc_serial_probe,
 	.ops	= &arc_serial_ops,
diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c
index 1d64496bf02..a53288dc917 100644
--- a/drivers/serial/serial_bcm283x_mu.c
+++ b/drivers/serial/serial_bcm283x_mu.c
@@ -167,7 +167,7 @@ static int bcm283x_mu_serial_probe(struct udevice *dev)
 		return -ENODEV;
 
 	/*
-	 * Read the ofdata here rather than in an ofdata_to_platdata() method
+	 * Read the ofdata here rather than in an of_to_plat() method
 	 * since we need the soc simple-bus to be probed so that the 'ranges'
 	 * property is used.
 	 */
diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c
index 6d7a87cf652..967f8421abc 100644
--- a/drivers/serial/serial_bcm283x_pl011.c
+++ b/drivers/serial/serial_bcm283x_pl011.c
@@ -43,11 +43,11 @@ static int bcm283x_pl011_serial_probe(struct udevice *dev)
 		return -ENODEV;
 
 	/*
-	 * Read the ofdata here rather than in an ofdata_to_platdata() method
+	 * Read the ofdata here rather than in an of_to_plat() method
 	 * since we need the soc simple-bus to be probed so that the 'ranges'
 	 * property is used.
 	 */
-	ret = pl01x_serial_ofdata_to_platdata(dev);
+	ret = pl01x_serial_of_to_plat(dev);
 	if (ret)
 		return ret;
 
diff --git a/drivers/serial/serial_coreboot.c b/drivers/serial/serial_coreboot.c
index dba0ae45fb4..ece27aca888 100644
--- a/drivers/serial/serial_coreboot.c
+++ b/drivers/serial/serial_coreboot.c
@@ -11,7 +11,7 @@
 #include <serial.h>
 #include <asm/arch/sysinfo.h>
 
-static int coreboot_ofdata_to_platdata(struct udevice *dev)
+static int coreboot_of_to_plat(struct udevice *dev)
 {
 	struct ns16550_platdata *plat = dev_get_plat(dev);
 	struct cb_serial *cb_info = lib_sysinfo.serial;
@@ -39,7 +39,7 @@ U_BOOT_DRIVER(coreboot_uart) = {
 	.of_match	= coreboot_serial_ids,
 	.priv_auto	= sizeof(struct NS16550),
 	.plat_auto	= sizeof(struct ns16550_platdata),
-	.ofdata_to_platdata  = coreboot_ofdata_to_platdata,
+	.of_to_plat  = coreboot_of_to_plat,
 	.probe	= ns16550_serial_probe,
 	.ops	= &ns16550_serial_ops,
 	.flags	= DM_FLAG_PRE_RELOC,
diff --git a/drivers/serial/serial_cortina.c b/drivers/serial/serial_cortina.c
index a0ae2fe0a4c..6dc81a775d3 100644
--- a/drivers/serial/serial_cortina.c
+++ b/drivers/serial/serial_cortina.c
@@ -131,7 +131,7 @@ static int ca_serial_probe(struct udevice *dev)
 	return 0;
 }
 
-static int ca_serial_ofdata_to_platdata(struct udevice *dev)
+static int ca_serial_of_to_plat(struct udevice *dev)
 {
 	struct ca_uart_priv *priv = dev_get_priv(dev);
 
@@ -158,7 +158,7 @@ U_BOOT_DRIVER(serial_cortina) = {
 	.name = "serial_cortina",
 	.id = UCLASS_SERIAL,
 	.of_match = ca_serial_ids,
-	.ofdata_to_platdata = ca_serial_ofdata_to_platdata,
+	.of_to_plat = ca_serial_of_to_plat,
 	.priv_auto	= sizeof(struct ca_uart_priv),
 	.probe = ca_serial_probe,
 	.ops = &ca_serial_ops
diff --git a/drivers/serial/serial_intel_mid.c b/drivers/serial/serial_intel_mid.c
index 2ee7e2d5de5..55da805b8e0 100644
--- a/drivers/serial/serial_intel_mid.c
+++ b/drivers/serial/serial_intel_mid.c
@@ -59,7 +59,7 @@ U_BOOT_DRIVER(serial_intel_mid) = {
 	.name	= "serial_intel_mid",
 	.id	= UCLASS_SERIAL,
 	.of_match = mid_serial_ids,
-	.ofdata_to_platdata = ns16550_serial_ofdata_to_platdata,
+	.of_to_plat = ns16550_serial_of_to_plat,
 	.plat_auto	= sizeof(struct ns16550_platdata),
 	.priv_auto	= sizeof(struct NS16550),
 	.probe	= mid_serial_probe,
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index e6b73e133e0..56362339be5 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -511,7 +511,7 @@ static int lpuart_serial_probe(struct udevice *dev)
 		return _lpuart_serial_init(dev);
 }
 
-static int lpuart_serial_ofdata_to_platdata(struct udevice *dev)
+static int lpuart_serial_of_to_plat(struct udevice *dev)
 {
 	struct lpuart_serial_platdata *plat = dev->plat;
 	const void *blob = gd->fdt_blob;
@@ -566,7 +566,7 @@ U_BOOT_DRIVER(serial_lpuart) = {
 	.name	= "serial_lpuart",
 	.id	= UCLASS_SERIAL,
 	.of_match = lpuart_serial_ids,
-	.ofdata_to_platdata = lpuart_serial_ofdata_to_platdata,
+	.of_to_plat = lpuart_serial_of_to_plat,
 	.plat_auto	= sizeof(struct lpuart_serial_platdata),
 	.probe = lpuart_serial_probe,
 	.ops	= &lpuart_serial_ops,
diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c
index 24b37fb6498..9b167c3c474 100644
--- a/drivers/serial/serial_mcf.c
+++ b/drivers/serial/serial_mcf.c
@@ -140,7 +140,7 @@ static int coldfire_serial_pending(struct udevice *dev, bool input)
 	return 0;
 }
 
-static int coldfire_ofdata_to_platdata(struct udevice *dev)
+static int coldfire_of_to_plat(struct udevice *dev)
 {
 	struct coldfire_serial_platdata *plat = dev_get_plat(dev);
 	fdt_addr_t addr_base;
@@ -171,7 +171,7 @@ U_BOOT_DRIVER(serial_coldfire) = {
 	.name = "serial_coldfire",
 	.id = UCLASS_SERIAL,
 	.of_match = coldfire_serial_ids,
-	.ofdata_to_platdata = coldfire_ofdata_to_platdata,
+	.of_to_plat = coldfire_of_to_plat,
 	.plat_auto	= sizeof(struct coldfire_serial_platdata),
 	.probe = coldfire_serial_probe,
 	.ops = &coldfire_serial_ops,
diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c
index 997426d56d1..ac3727d1c29 100644
--- a/drivers/serial/serial_meson.c
+++ b/drivers/serial/serial_meson.c
@@ -136,7 +136,7 @@ static int meson_serial_pending(struct udevice *dev, bool input)
 	}
 }
 
-static int meson_serial_ofdata_to_platdata(struct udevice *dev)
+static int meson_serial_of_to_plat(struct udevice *dev)
 {
 	struct meson_serial_platdata *plat = dev->plat;
 	fdt_addr_t addr;
@@ -168,7 +168,7 @@ U_BOOT_DRIVER(serial_meson) = {
 	.of_match	= meson_serial_ids,
 	.probe		= meson_serial_probe,
 	.ops		= &meson_serial_ops,
-	.ofdata_to_platdata = meson_serial_ofdata_to_platdata,
+	.of_to_plat = meson_serial_of_to_plat,
 	.plat_auto	= sizeof(struct meson_serial_platdata),
 };
 
diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c
index 3b088b3b23a..024c2c956e4 100644
--- a/drivers/serial/serial_msm.c
+++ b/drivers/serial/serial_msm.c
@@ -216,7 +216,7 @@ static int msm_serial_probe(struct udevice *dev)
 	return 0;
 }
 
-static int msm_serial_ofdata_to_platdata(struct udevice *dev)
+static int msm_serial_of_to_plat(struct udevice *dev)
 {
 	struct msm_serial_data *priv = dev_get_priv(dev);
 
@@ -239,7 +239,7 @@ U_BOOT_DRIVER(serial_msm) = {
 	.name	= "serial_msm",
 	.id	= UCLASS_SERIAL,
 	.of_match = msm_serial_ids,
-	.ofdata_to_platdata = msm_serial_ofdata_to_platdata,
+	.of_to_plat = msm_serial_of_to_plat,
 	.priv_auto	= sizeof(struct msm_serial_data),
 	.probe = msm_serial_probe,
 	.ops	= &msm_serial_ops,
diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c
index afa6e8c8a96..665b2aa3b2c 100644
--- a/drivers/serial/serial_mtk.c
+++ b/drivers/serial/serial_mtk.c
@@ -216,7 +216,7 @@ static int mtk_serial_probe(struct udevice *dev)
 	return 0;
 }
 
-static int mtk_serial_ofdata_to_platdata(struct udevice *dev)
+static int mtk_serial_of_to_plat(struct udevice *dev)
 {
 	struct mtk_serial_priv *priv = dev_get_priv(dev);
 	fdt_addr_t addr;
@@ -267,7 +267,7 @@ U_BOOT_DRIVER(serial_mtk) = {
 	.name = "serial_mtk",
 	.id = UCLASS_SERIAL,
 	.of_match = mtk_serial_ids,
-	.ofdata_to_platdata = mtk_serial_ofdata_to_platdata,
+	.of_to_plat = mtk_serial_of_to_plat,
 	.priv_auto	= sizeof(struct mtk_serial_priv),
 	.probe = mtk_serial_probe,
 	.ops = &mtk_serial_ops,
diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c
index b1da8746450..f4676f0b8e0 100644
--- a/drivers/serial/serial_mvebu_a3700.c
+++ b/drivers/serial/serial_mvebu_a3700.c
@@ -100,7 +100,7 @@ static int mvebu_serial_probe(struct udevice *dev)
 	return 0;
 }
 
-static int mvebu_serial_ofdata_to_platdata(struct udevice *dev)
+static int mvebu_serial_of_to_plat(struct udevice *dev)
 {
 	struct mvebu_platdata *plat = dev_get_plat(dev);
 
@@ -125,7 +125,7 @@ U_BOOT_DRIVER(serial_mvebu) = {
 	.name	= "serial_mvebu",
 	.id	= UCLASS_SERIAL,
 	.of_match = mvebu_serial_ids,
-	.ofdata_to_platdata = mvebu_serial_ofdata_to_platdata,
+	.of_to_plat = mvebu_serial_of_to_plat,
 	.plat_auto	= sizeof(struct mvebu_platdata),
 	.probe	= mvebu_serial_probe,
 	.ops	= &mvebu_serial_ops,
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index a228bc4c9ef..9602ddc7e04 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -325,7 +325,7 @@ static const struct dm_serial_ops mxc_serial_ops = {
 };
 
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-static int mxc_serial_ofdata_to_platdata(struct udevice *dev)
+static int mxc_serial_of_to_plat(struct udevice *dev)
 {
 	struct mxc_serial_platdata *plat = dev->plat;
 	fdt_addr_t addr;
@@ -357,7 +357,7 @@ U_BOOT_DRIVER(serial_mxc) = {
 	.id	= UCLASS_SERIAL,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.of_match = mxc_serial_ids,
-	.ofdata_to_platdata = mxc_serial_ofdata_to_platdata,
+	.of_to_plat = mxc_serial_of_to_plat,
 	.plat_auto	= sizeof(struct mxc_serial_platdata),
 #endif
 	.probe = mxc_serial_probe,
diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c
index 26e03b8620b..2b0a3e4d06d 100644
--- a/drivers/serial/serial_omap.c
+++ b/drivers/serial/serial_omap.c
@@ -99,7 +99,7 @@ DEBUG_UART_FUNCS
 #if CONFIG_IS_ENABLED(DM_SERIAL)
 
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
-static int omap_serial_ofdata_to_platdata(struct udevice *dev)
+static int omap_serial_of_to_plat(struct udevice *dev)
 {
 	struct ns16550_platdata *plat = dev->plat;
 	fdt_addr_t addr;
@@ -157,7 +157,7 @@ U_BOOT_DRIVER(omap_serial) = {
 	.id	= UCLASS_SERIAL,
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = omap_serial_ids,
-	.ofdata_to_platdata = omap_serial_ofdata_to_platdata,
+	.of_to_plat = omap_serial_of_to_plat,
 	.plat_auto	= sizeof(struct ns16550_platdata),
 #endif
 	.priv_auto	= sizeof(struct NS16550),
diff --git a/drivers/serial/serial_owl.c b/drivers/serial/serial_owl.c
index 0e67bc124b0..3b795785f78 100644
--- a/drivers/serial/serial_owl.c
+++ b/drivers/serial/serial_owl.c
@@ -102,7 +102,7 @@ static int owl_serial_probe(struct udevice *dev)
 	return 0;
 }
 
-static int owl_serial_ofdata_to_platdata(struct	udevice	*dev)
+static int owl_serial_of_to_plat(struct	udevice	*dev)
 {
 	struct owl_serial_priv *priv = dev_get_priv(dev);
 
@@ -129,7 +129,7 @@ U_BOOT_DRIVER(serial_owl) = {
 	.name = "serial_owl",
 	.id = UCLASS_SERIAL,
 	.of_match = owl_serial_ids,
-	.ofdata_to_platdata = owl_serial_ofdata_to_platdata,
+	.of_to_plat = owl_serial_of_to_plat,
 	.priv_auto	=	sizeof(struct owl_serial_priv),
 	.probe = owl_serial_probe,
 	.ops = &owl_serial_ops,
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index 5ca1c07b9d5..45bc1de0593 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -348,7 +348,7 @@ static const struct udevice_id pl01x_serial_id[] ={
 #define CONFIG_PL011_CLOCK 0
 #endif
 
-int pl01x_serial_ofdata_to_platdata(struct udevice *dev)
+int pl01x_serial_of_to_plat(struct udevice *dev)
 {
 	struct pl01x_serial_platdata *plat = dev_get_plat(dev);
 	struct clk clk;
@@ -387,7 +387,7 @@ U_BOOT_DRIVER(serial_pl01x) = {
 	.name	= "serial_pl01x",
 	.id	= UCLASS_SERIAL,
 	.of_match = of_match_ptr(pl01x_serial_id),
-	.ofdata_to_platdata = of_match_ptr(pl01x_serial_ofdata_to_platdata),
+	.of_to_plat = of_match_ptr(pl01x_serial_of_to_plat),
 	.plat_auto	= sizeof(struct pl01x_serial_platdata),
 	.probe = pl01x_serial_probe,
 	.ops	= &pl01x_serial_ops,
diff --git a/drivers/serial/serial_pl01x_internal.h b/drivers/serial/serial_pl01x_internal.h
index c5c706b153e..dfd95a0b77c 100644
--- a/drivers/serial/serial_pl01x_internal.h
+++ b/drivers/serial/serial_pl01x_internal.h
@@ -40,7 +40,7 @@ struct pl01x_regs {
 
 #ifdef CONFIG_DM_SERIAL
 
-int pl01x_serial_ofdata_to_platdata(struct udevice *dev);
+int pl01x_serial_of_to_plat(struct udevice *dev);
 int pl01x_serial_probe(struct udevice *dev);
 
 /* Needed for external pl01x_serial_ops drivers */
diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index 4323f61392d..b8ba5da5f18 100644
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -176,7 +176,7 @@ static int s5p_serial_pending(struct udevice *dev, bool input)
 		return (ufstat & TX_FIFO_COUNT_MASK) >> TX_FIFO_COUNT_SHIFT;
 }
 
-static int s5p_serial_ofdata_to_platdata(struct udevice *dev)
+static int s5p_serial_of_to_plat(struct udevice *dev)
 {
 	struct s5p_serial_platdata *plat = dev->plat;
 	fdt_addr_t addr;
@@ -207,7 +207,7 @@ U_BOOT_DRIVER(serial_s5p) = {
 	.name	= "serial_s5p",
 	.id	= UCLASS_SERIAL,
 	.of_match = s5p_serial_ids,
-	.ofdata_to_platdata = s5p_serial_ofdata_to_platdata,
+	.of_to_plat = s5p_serial_of_to_plat,
 	.plat_auto	= sizeof(struct s5p_serial_platdata),
 	.probe = s5p_serial_probe,
 	.ops	= &s5p_serial_ops,
diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index d1f24bb27a2..a961ead1d4d 100644
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -207,7 +207,7 @@ static const struct udevice_id sh_serial_id[] ={
 	{}
 };
 
-static int sh_serial_ofdata_to_platdata(struct udevice *dev)
+static int sh_serial_of_to_plat(struct udevice *dev)
 {
 	struct sh_serial_platdata *plat = dev_get_plat(dev);
 	struct clk sh_serial_clk;
@@ -239,7 +239,7 @@ U_BOOT_DRIVER(serial_sh) = {
 	.name	= "serial_sh",
 	.id	= UCLASS_SERIAL,
 	.of_match = of_match_ptr(sh_serial_id),
-	.ofdata_to_platdata = of_match_ptr(sh_serial_ofdata_to_platdata),
+	.of_to_plat = of_match_ptr(sh_serial_of_to_plat),
 	.plat_auto	= sizeof(struct sh_serial_platdata),
 	.probe	= sh_serial_probe,
 	.ops	= &sh_serial_ops,
diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c
index e9d4d91b45f..5248c6814c4 100644
--- a/drivers/serial/serial_sifive.c
+++ b/drivers/serial/serial_sifive.c
@@ -174,7 +174,7 @@ static int sifive_serial_pending(struct udevice *dev, bool input)
 		return !!(readl(&regs->txfifo) & UART_TXFIFO_FULL);
 }
 
-static int sifive_serial_ofdata_to_platdata(struct udevice *dev)
+static int sifive_serial_of_to_plat(struct udevice *dev)
 {
 	struct sifive_uart_platdata *plat = dev_get_plat(dev);
 
@@ -201,7 +201,7 @@ U_BOOT_DRIVER(serial_sifive) = {
 	.name	= "serial_sifive",
 	.id	= UCLASS_SERIAL,
 	.of_match = sifive_serial_ids,
-	.ofdata_to_platdata = sifive_serial_ofdata_to_platdata,
+	.of_to_plat = sifive_serial_of_to_plat,
 	.plat_auto	= sizeof(struct sifive_uart_platdata),
 	.probe = sifive_serial_probe,
 	.ops	= &sifive_serial_ops,
diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c
index 9b56b2439ca..63344b34186 100644
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -217,7 +217,7 @@ static const struct udevice_id stm32_serial_id[] = {
 	{}
 };
 
-static int stm32_serial_ofdata_to_platdata(struct udevice *dev)
+static int stm32_serial_of_to_plat(struct udevice *dev)
 {
 	struct stm32x7_serial_platdata *plat = dev_get_plat(dev);
 
@@ -240,7 +240,7 @@ U_BOOT_DRIVER(serial_stm32) = {
 	.name = "serial_stm32",
 	.id = UCLASS_SERIAL,
 	.of_match = of_match_ptr(stm32_serial_id),
-	.ofdata_to_platdata = of_match_ptr(stm32_serial_ofdata_to_platdata),
+	.of_to_plat = of_match_ptr(stm32_serial_of_to_plat),
 	.plat_auto	= sizeof(struct stm32x7_serial_platdata),
 	.ops = &stm32_serial_ops,
 	.probe = stm32_serial_probe,
diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c
index ea90fdbf384..df4877a0b91 100644
--- a/drivers/serial/serial_xuartlite.c
+++ b/drivers/serial/serial_xuartlite.c
@@ -106,7 +106,7 @@ static int uartlite_serial_probe(struct udevice *dev)
 	return 0;
 }
 
-static int uartlite_serial_ofdata_to_platdata(struct udevice *dev)
+static int uartlite_serial_of_to_plat(struct udevice *dev)
 {
 	struct uartlite_platdata *plat = dev_get_plat(dev);
 
@@ -131,7 +131,7 @@ U_BOOT_DRIVER(serial_uartlite) = {
 	.name	= "serial_uartlite",
 	.id	= UCLASS_SERIAL,
 	.of_match = uartlite_serial_ids,
-	.ofdata_to_platdata = uartlite_serial_ofdata_to_platdata,
+	.of_to_plat = uartlite_serial_of_to_plat,
 	.plat_auto	= sizeof(struct uartlite_platdata),
 	.probe = uartlite_serial_probe,
 	.ops	= &uartlite_serial_ops,
diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index 1bcdf8cb10b..1d748e16ee9 100644
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -182,7 +182,7 @@ static int zynq_serial_pending(struct udevice *dev, bool input)
 		return !!(readl(&regs->channel_sts) & ZYNQ_UART_SR_TXACTIVE);
 }
 
-static int zynq_serial_ofdata_to_platdata(struct udevice *dev)
+static int zynq_serial_of_to_plat(struct udevice *dev)
 {
 	struct zynq_uart_platdata *plat = dev_get_plat(dev);
 
@@ -211,7 +211,7 @@ U_BOOT_DRIVER(serial_zynq) = {
 	.name	= "serial_zynq",
 	.id	= UCLASS_SERIAL,
 	.of_match = zynq_serial_ids,
-	.ofdata_to_platdata = zynq_serial_ofdata_to_platdata,
+	.of_to_plat = zynq_serial_of_to_plat,
 	.plat_auto	= sizeof(struct zynq_uart_platdata),
 	.probe = zynq_serial_probe,
 	.ops	= &zynq_serial_ops,
diff --git a/drivers/sound/max98357a.c b/drivers/sound/max98357a.c
index b3d27a3616e..a2088f03014 100644
--- a/drivers/sound/max98357a.c
+++ b/drivers/sound/max98357a.c
@@ -25,7 +25,7 @@ struct max98357a_priv {
 	struct gpio_desc sdmode_gpio;
 };
 
-static int max98357a_ofdata_to_platdata(struct udevice *dev)
+static int max98357a_of_to_plat(struct udevice *dev)
 {
 	struct max98357a_priv *priv = dev_get_priv(dev);
 	int ret;
@@ -155,7 +155,7 @@ U_BOOT_DRIVER(max98357a) = {
 	.name		= "max98357a",
 	.id		= UCLASS_AUDIO_CODEC,
 	.of_match	= max98357a_ids,
-	.ofdata_to_platdata	= max98357a_ofdata_to_platdata,
+	.of_to_plat	= max98357a_of_to_plat,
 	.ops		= &max98357a_ops,
 	ACPI_OPS_PTR(&max98357a_acpi_ops)
 };
diff --git a/drivers/sound/samsung-i2s.c b/drivers/sound/samsung-i2s.c
index aa1d6bb209b..d3d75c046eb 100644
--- a/drivers/sound/samsung-i2s.c
+++ b/drivers/sound/samsung-i2s.c
@@ -385,7 +385,7 @@ static int samsung_i2s_probe(struct udevice *dev)
 	return i2s_tx_init(priv);
 }
 
-static int samsung_i2s_ofdata_to_platdata(struct udevice *dev)
+static int samsung_i2s_of_to_plat(struct udevice *dev)
 {
 	struct i2s_uc_priv *priv = dev_get_uclass_priv(dev);
 	ulong base;
@@ -451,6 +451,6 @@ U_BOOT_DRIVER(samsung_i2s) = {
 	.id		= UCLASS_I2S,
 	.of_match	= samsung_i2s_ids,
 	.probe		= samsung_i2s_probe,
-	.ofdata_to_platdata	= samsung_i2s_ofdata_to_platdata,
+	.of_to_plat	= samsung_i2s_of_to_plat,
 	.ops		= &samsung_i2s_ops,
 };
diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c
index a4a29f80737..187f2394b74 100644
--- a/drivers/spi/altera_spi.c
+++ b/drivers/spi/altera_spi.c
@@ -169,7 +169,7 @@ static int altera_spi_probe(struct udevice *bus)
 	return 0;
 }
 
-static int altera_spi_ofdata_to_platdata(struct udevice *bus)
+static int altera_spi_of_to_plat(struct udevice *bus)
 {
 	struct altera_spi_platdata *plat = dev_get_plat(bus);
 
@@ -202,7 +202,7 @@ U_BOOT_DRIVER(altera_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = altera_spi_ids,
 	.ops	= &altera_spi_ops,
-	.ofdata_to_platdata = altera_spi_ofdata_to_platdata,
+	.of_to_plat = altera_spi_of_to_plat,
 	.plat_auto	= sizeof(struct altera_spi_platdata),
 	.priv_auto	= sizeof(struct altera_spi_priv),
 	.probe	= altera_spi_probe,
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index f62387cf9b4..9917b5414a6 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -408,7 +408,7 @@ U_BOOT_DRIVER(atcspi200_spi) = {
 	.id = UCLASS_SPI,
 	.of_match = atcspi200_spi_ids,
 	.ops = &atcspi200_spi_ops,
-	.ofdata_to_platdata = atcspi200_ofdata_to_platadata,
+	.of_to_plat = atcspi200_ofdata_to_platadata,
 	.priv_auto	= sizeof(struct nds_spi_slave),
 	.probe = atcspi200_spi_probe,
 };
diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c
index 83ca649f129..3afc051d21d 100644
--- a/drivers/spi/bcmstb_spi.c
+++ b/drivers/spi/bcmstb_spi.c
@@ -94,7 +94,7 @@ struct bcmstb_spi_priv {
 	void *saved_din_addr;
 };
 
-static int bcmstb_spi_ofdata_to_platdata(struct udevice *bus)
+static int bcmstb_spi_of_to_plat(struct udevice *bus)
 {
 	struct bcmstb_spi_platdata *plat = dev_get_plat(bus);
 	const void *fdt = gd->fdt_blob;
@@ -432,7 +432,7 @@ U_BOOT_DRIVER(bcmstb_spi) = {
 	.id				= UCLASS_SPI,
 	.of_match			= bcmstb_spi_id,
 	.ops				= &bcmstb_spi_ops,
-	.ofdata_to_platdata		= bcmstb_spi_ofdata_to_platdata,
+	.of_to_plat		= bcmstb_spi_of_to_plat,
 	.probe				= bcmstb_spi_probe,
 	.plat_auto	= sizeof(struct bcmstb_spi_platdata),
 	.priv_auto		= sizeof(struct bcmstb_spi_priv),
diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c
index f097fc17a57..2317d365596 100644
--- a/drivers/spi/cadence_qspi.c
+++ b/drivers/spi/cadence_qspi.c
@@ -282,7 +282,7 @@ static int cadence_spi_mem_exec_op(struct spi_slave *spi,
 	return err;
 }
 
-static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
+static int cadence_spi_of_to_plat(struct udevice *bus)
 {
 	struct cadence_spi_platdata *plat = bus->plat;
 	ofnode subnode;
@@ -353,7 +353,7 @@ U_BOOT_DRIVER(cadence_spi) = {
 	.id = UCLASS_SPI,
 	.of_match = cadence_spi_ids,
 	.ops = &cadence_spi_ops,
-	.ofdata_to_platdata = cadence_spi_ofdata_to_platdata,
+	.of_to_plat = cadence_spi_of_to_plat,
 	.plat_auto	= sizeof(struct cadence_spi_platdata),
 	.priv_auto	= sizeof(struct cadence_spi_priv),
 	.probe = cadence_spi_probe,
diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c
index 68dec34afc4..ab0332a77a6 100644
--- a/drivers/spi/cf_spi.c
+++ b/drivers/spi/cf_spi.c
@@ -384,7 +384,7 @@ static int coldfire_spi_probe(struct udevice *bus)
 }
 
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
-static int coldfire_dspi_ofdata_to_platdata(struct udevice *bus)
+static int coldfire_dspi_of_to_plat(struct udevice *bus)
 {
 	fdt_addr_t addr;
 	struct coldfire_spi_platdata *plat = bus->plat;
@@ -451,7 +451,7 @@ U_BOOT_DRIVER(coldfire_spi) = {
 	.id = UCLASS_SPI,
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = coldfire_spi_ids,
-	.ofdata_to_platdata = coldfire_dspi_ofdata_to_platdata,
+	.of_to_plat = coldfire_dspi_of_to_plat,
 	.plat_auto	= sizeof(struct coldfire_spi_platdata),
 #endif
 	.probe = coldfire_spi_probe,
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index c60f2fedf3b..0f887ed649a 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -419,7 +419,7 @@ U_BOOT_DRIVER(davinci_spi) = {
 	.id = UCLASS_SPI,
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = davinci_spi_ids,
-	.ofdata_to_platdata = davinci_ofdata_to_platadata,
+	.of_to_plat = davinci_ofdata_to_platadata,
 	.plat_auto	= sizeof(struct davinci_spi_platdata),
 #endif
 	.probe = davinci_spi_probe,
diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c
index 99069097497..5429ac776ed 100644
--- a/drivers/spi/designware_spi.c
+++ b/drivers/spi/designware_spi.c
@@ -153,7 +153,7 @@ static int request_gpio_cs(struct udevice *bus)
 	return 0;
 }
 
-static int dw_spi_ofdata_to_platdata(struct udevice *bus)
+static int dw_spi_of_to_plat(struct udevice *bus)
 {
 	struct dw_spi_platdata *plat = bus->plat;
 
@@ -559,7 +559,7 @@ U_BOOT_DRIVER(dw_spi) = {
 	.id = UCLASS_SPI,
 	.of_match = dw_spi_ids,
 	.ops = &dw_spi_ops,
-	.ofdata_to_platdata = dw_spi_ofdata_to_platdata,
+	.of_to_plat = dw_spi_of_to_plat,
 	.plat_auto	= sizeof(struct dw_spi_platdata),
 	.priv_auto	= sizeof(struct dw_spi_priv),
 	.probe = dw_spi_probe,
diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c
index 04737368bd4..9505d88ff06 100644
--- a/drivers/spi/exynos_spi.c
+++ b/drivers/spi/exynos_spi.c
@@ -251,7 +251,7 @@ static void spi_cs_deactivate(struct udevice *dev)
 	debug("Deactivate CS, bus '%s'\n", bus->name);
 }
 
-static int exynos_spi_ofdata_to_platdata(struct udevice *bus)
+static int exynos_spi_of_to_plat(struct udevice *bus)
 {
 	struct exynos_spi_platdata *plat = bus->plat;
 	const void *blob = gd->fdt_blob;
@@ -426,7 +426,7 @@ U_BOOT_DRIVER(exynos_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = exynos_spi_ids,
 	.ops	= &exynos_spi_ops,
-	.ofdata_to_platdata = exynos_spi_ofdata_to_platdata,
+	.of_to_plat = exynos_spi_of_to_plat,
 	.plat_auto	= sizeof(struct exynos_spi_platdata),
 	.priv_auto	= sizeof(struct exynos_spi_priv),
 	.probe	= exynos_spi_probe,
diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c
index c91530cd930..56da67024e0 100644
--- a/drivers/spi/fsl_dspi.c
+++ b/drivers/spi/fsl_dspi.c
@@ -573,7 +573,7 @@ static int fsl_dspi_bind(struct udevice *bus)
 	return 0;
 }
 
-static int fsl_dspi_ofdata_to_platdata(struct udevice *bus)
+static int fsl_dspi_of_to_plat(struct udevice *bus)
 {
 	fdt_addr_t addr;
 	struct fsl_dspi_platdata *plat = bus->plat;
@@ -659,7 +659,7 @@ U_BOOT_DRIVER(fsl_dspi) = {
 	.id	= UCLASS_SPI,
 	.of_match = fsl_dspi_ids,
 	.ops	= &fsl_dspi_ops,
-	.ofdata_to_platdata = fsl_dspi_ofdata_to_platdata,
+	.of_to_plat = fsl_dspi_of_to_plat,
 	.plat_auto	= sizeof(struct fsl_dspi_platdata),
 	.priv_auto	= sizeof(struct fsl_dspi_priv),
 	.probe	= fsl_dspi_probe,
diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c
index 7061bd23494..b41d3d83fe6 100644
--- a/drivers/spi/fsl_espi.c
+++ b/drivers/spi/fsl_espi.c
@@ -541,7 +541,7 @@ static const struct dm_spi_ops fsl_espi_ops = {
 };
 
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
-static int fsl_espi_ofdata_to_platdata(struct udevice *bus)
+static int fsl_espi_of_to_plat(struct udevice *bus)
 {
 	fdt_addr_t addr;
 	struct fsl_espi_platdata   *plat = bus->plat;
@@ -573,7 +573,7 @@ U_BOOT_DRIVER(fsl_espi) = {
 	.id	= UCLASS_SPI,
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = fsl_espi_ids,
-	.ofdata_to_platdata = fsl_espi_ofdata_to_platdata,
+	.of_to_plat = fsl_espi_of_to_plat,
 #endif
 	.ops	= &fsl_espi_ops,
 	.plat_auto	= sizeof(struct fsl_espi_platdata),
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index b42b536ac31..4c01ec86e03 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -945,7 +945,7 @@ static int ich_spi_child_pre_probe(struct udevice *dev)
 	return 0;
 }
 
-static int ich_spi_ofdata_to_platdata(struct udevice *dev)
+static int ich_spi_of_to_plat(struct udevice *dev)
 {
 	struct ich_spi_platdata *plat = dev_get_plat(dev);
 
@@ -1004,7 +1004,7 @@ U_BOOT_DRIVER(intel_fast_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = ich_spi_ids,
 	.ops	= &ich_spi_ops,
-	.ofdata_to_platdata = ich_spi_ofdata_to_platdata,
+	.of_to_plat = ich_spi_of_to_plat,
 	.plat_auto	= sizeof(struct ich_spi_platdata),
 	.priv_auto	= sizeof(struct ich_spi_priv),
 	.child_pre_probe = ich_spi_child_pre_probe,
diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c
index 9e0a1bb83c6..669a44ce088 100644
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -230,7 +230,7 @@ static int mvebu_spi_probe(struct udevice *bus)
 	return 0;
 }
 
-static int mvebu_spi_ofdata_to_platdata(struct udevice *bus)
+static int mvebu_spi_of_to_plat(struct udevice *bus)
 {
 	struct mvebu_spi_platdata *plat = dev_get_plat(bus);
 	const struct mvebu_spi_dev *drvdata =
@@ -295,7 +295,7 @@ U_BOOT_DRIVER(mvebu_spi) = {
 	.id = UCLASS_SPI,
 	.of_match = mvebu_spi_ids,
 	.ops = &mvebu_spi_ops,
-	.ofdata_to_platdata = mvebu_spi_ofdata_to_platdata,
+	.of_to_plat = mvebu_spi_of_to_plat,
 	.plat_auto	= sizeof(struct mvebu_spi_platdata),
 	.priv_auto	= sizeof(struct mvebu_spi_priv),
 	.probe = mvebu_spi_probe,
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index 74ff56d816a..02f8219ca1f 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -48,7 +48,7 @@ struct mpc8xxx_priv {
 
 #define SPI_TIMEOUT	1000
 
-static int mpc8xxx_spi_ofdata_to_platdata(struct udevice *dev)
+static int mpc8xxx_spi_of_to_plat(struct udevice *dev)
 {
 	struct mpc8xxx_priv *priv = dev_get_priv(dev);
 	struct clk clk;
@@ -279,7 +279,7 @@ U_BOOT_DRIVER(mpc8xxx_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = mpc8xxx_spi_ids,
 	.ops	= &mpc8xxx_spi_ops,
-	.ofdata_to_platdata = mpc8xxx_spi_ofdata_to_platdata,
+	.of_to_plat = mpc8xxx_spi_of_to_plat,
 	.probe	= mpc8xxx_spi_probe,
 	.priv_auto	= sizeof(struct mpc8xxx_priv),
 };
diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c
index 3c4523a5085..32a26d40413 100644
--- a/drivers/spi/mvebu_a3700_spi.c
+++ b/drivers/spi/mvebu_a3700_spi.c
@@ -279,7 +279,7 @@ static int mvebu_spi_probe(struct udevice *bus)
 	return 0;
 }
 
-static int mvebu_spi_ofdata_to_platdata(struct udevice *bus)
+static int mvebu_spi_of_to_plat(struct udevice *bus)
 {
 	struct mvebu_spi_platdata *plat = dev_get_plat(bus);
 	int ret;
@@ -324,7 +324,7 @@ U_BOOT_DRIVER(mvebu_spi) = {
 	.id = UCLASS_SPI,
 	.of_match = mvebu_spi_ids,
 	.ops = &mvebu_spi_ops,
-	.ofdata_to_platdata = mvebu_spi_ofdata_to_platdata,
+	.of_to_plat = mvebu_spi_of_to_plat,
 	.plat_auto	= sizeof(struct mvebu_spi_platdata),
 	.probe = mvebu_spi_probe,
 	.remove = mvebu_spi_remove,
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
index 3f7aade81f0..0973d511f12 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -441,7 +441,7 @@ static const struct dm_spi_ops mxs_spi_ops = {
 };
 
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
-static int mxs_ofdata_to_platdata(struct udevice *bus)
+static int mxs_of_to_plat(struct udevice *bus)
 {
 	struct mxs_spi_platdata *plat = bus->plat;
 	u32 prop[2];
@@ -485,7 +485,7 @@ U_BOOT_DRIVER(fsl_imx23_spi) = {
 	.id	= UCLASS_SPI,
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = mxs_spi_ids,
-	.ofdata_to_platdata = mxs_ofdata_to_platdata,
+	.of_to_plat = mxs_of_to_plat,
 #endif
 	.plat_auto	= sizeof(struct mxs_spi_platdata),
 	.ops	= &mxs_spi_ops,
diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c
index f41134172cc..04a296a5ba5 100644
--- a/drivers/spi/nxp_fspi.c
+++ b/drivers/spi/nxp_fspi.c
@@ -922,7 +922,7 @@ static int nxp_fspi_set_mode(struct udevice *bus, uint mode)
 	return 0;
 }
 
-static int nxp_fspi_ofdata_to_platdata(struct udevice *bus)
+static int nxp_fspi_of_to_plat(struct udevice *bus)
 {
 	struct nxp_fspi *f = dev_get_priv(bus);
 #if CONFIG_IS_ENABLED(CLK)
@@ -993,7 +993,7 @@ U_BOOT_DRIVER(nxp_fspi) = {
 	.id	= UCLASS_SPI,
 	.of_match = nxp_fspi_ids,
 	.ops	= &nxp_fspi_ops,
-	.ofdata_to_platdata = nxp_fspi_ofdata_to_platdata,
+	.of_to_plat = nxp_fspi_of_to_plat,
 	.priv_auto	= sizeof(struct nxp_fspi),
 	.probe	= nxp_fspi_probe,
 };
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index ea722e47604..0594a9c14af 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -478,7 +478,7 @@ static struct omap2_mcspi_platform_config omap4_pdata = {
 	.regs_offset = OMAP4_MCSPI_REG_OFFSET,
 };
 
-static int omap3_spi_ofdata_to_platdata(struct udevice *dev)
+static int omap3_spi_of_to_plat(struct udevice *dev)
 {
 	struct omap2_mcspi_platform_config *data =
 		(struct omap2_mcspi_platform_config *)dev_get_driver_data(dev);
@@ -506,7 +506,7 @@ U_BOOT_DRIVER(omap3_spi) = {
 	.flags	= DM_FLAG_PRE_RELOC,
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = omap3_spi_ids,
-	.ofdata_to_platdata = omap3_spi_ofdata_to_platdata,
+	.of_to_plat = omap3_spi_of_to_plat,
 	.plat_auto	= sizeof(struct omap3_spi_plat),
 #endif
 	.probe = omap3_spi_probe,
diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c
index 3d1420381d9..179582cad7d 100644
--- a/drivers/spi/pl022_spi.c
+++ b/drivers/spi/pl022_spi.c
@@ -286,7 +286,7 @@ static const struct dm_spi_ops pl022_spi_ops = {
 };
 
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
-static int pl022_spi_ofdata_to_platdata(struct udevice *bus)
+static int pl022_spi_of_to_plat(struct udevice *bus)
 {
 	struct pl022_spi_pdata *plat = bus->plat;
 	const void *fdt = gd->fdt_blob;
@@ -316,7 +316,7 @@ U_BOOT_DRIVER(pl022_spi) = {
 	.id     = UCLASS_SPI,
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = pl022_spi_ids,
-	.ofdata_to_platdata = pl022_spi_ofdata_to_platdata,
+	.of_to_plat = pl022_spi_of_to_plat,
 #endif
 	.ops    = &pl022_spi_ops,
 	.plat_auto	= sizeof(struct pl022_spi_pdata),
diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c
index 87d6e4897fe..7a030b11416 100644
--- a/drivers/spi/renesas_rpc_spi.c
+++ b/drivers/spi/renesas_rpc_spi.c
@@ -417,7 +417,7 @@ static int rpc_spi_probe(struct udevice *dev)
 	return 0;
 }
 
-static int rpc_spi_ofdata_to_platdata(struct udevice *bus)
+static int rpc_spi_of_to_plat(struct udevice *bus)
 {
 	struct rpc_spi_platdata *plat = dev_get_plat(bus);
 
@@ -463,7 +463,7 @@ U_BOOT_DRIVER(rpc_spi) = {
 	.id		= UCLASS_SPI,
 	.of_match	= rpc_spi_ids,
 	.ops		= &rpc_spi_ops,
-	.ofdata_to_platdata = rpc_spi_ofdata_to_platdata,
+	.of_to_plat = rpc_spi_of_to_plat,
 	.plat_auto	= sizeof(struct rpc_spi_platdata),
 	.priv_auto	= sizeof(struct rpc_spi_priv),
 	.bind		= rpc_spi_bind,
diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c
index 697f50f408f..56cf7642ea7 100644
--- a/drivers/spi/rk_spi.c
+++ b/drivers/spi/rk_spi.c
@@ -191,7 +191,7 @@ static int conv_of_platdata(struct udevice *dev)
 }
 #endif
 
-static int rockchip_spi_ofdata_to_platdata(struct udevice *bus)
+static int rockchip_spi_of_to_plat(struct udevice *bus)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct rockchip_spi_platdata *plat = dev_get_plat(bus);
@@ -559,7 +559,7 @@ U_BOOT_DRIVER(rockchip_rk3288_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = rockchip_spi_ids,
 	.ops	= &rockchip_spi_ops,
-	.ofdata_to_platdata = rockchip_spi_ofdata_to_platdata,
+	.of_to_plat = rockchip_spi_of_to_plat,
 	.plat_auto	= sizeof(struct rockchip_spi_platdata),
 	.priv_auto	= sizeof(struct rockchip_spi_priv),
 	.probe	= rockchip_spi_probe,
diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c
index dd732dcc2f4..5ba8a8ea79f 100644
--- a/drivers/spi/sh_qspi.c
+++ b/drivers/spi/sh_qspi.c
@@ -328,7 +328,7 @@ static int sh_qspi_probe(struct udevice *dev)
 	return 0;
 }
 
-static int sh_qspi_ofdata_to_platdata(struct udevice *dev)
+static int sh_qspi_of_to_plat(struct udevice *dev)
 {
 	struct sh_qspi_slave *plat = dev_get_plat(dev);
 
@@ -353,7 +353,7 @@ U_BOOT_DRIVER(sh_qspi) = {
 	.id		= UCLASS_SPI,
 	.of_match	= sh_qspi_ids,
 	.ops		= &sh_qspi_ops,
-	.ofdata_to_platdata = sh_qspi_ofdata_to_platdata,
+	.of_to_plat = sh_qspi_of_to_plat,
 	.plat_auto	= sizeof(struct sh_qspi_slave),
 	.probe		= sh_qspi_probe,
 };
diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c
index 1967134d418..d4a886ad405 100644
--- a/drivers/spi/soft_spi.c
+++ b/drivers/spi/soft_spi.c
@@ -226,7 +226,7 @@ static const struct dm_spi_ops soft_spi_ops = {
 	.set_mode	= soft_spi_set_mode,
 };
 
-static int soft_spi_ofdata_to_platdata(struct udevice *dev)
+static int soft_spi_of_to_plat(struct udevice *dev)
 {
 	struct soft_spi_platdata *plat = dev->plat;
 	const void *blob = gd->fdt_blob;
@@ -280,7 +280,7 @@ U_BOOT_DRIVER(soft_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = soft_spi_ids,
 	.ops	= &soft_spi_ops,
-	.ofdata_to_platdata = soft_spi_ofdata_to_platdata,
+	.of_to_plat = soft_spi_of_to_plat,
 	.plat_auto	= sizeof(struct soft_spi_platdata),
 	.priv_auto	= sizeof(struct soft_spi_priv),
 	.probe	= soft_spi_probe,
diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c
index 8ee8c90d276..00703f921df 100644
--- a/drivers/spi/spi-sunxi.c
+++ b/drivers/spi/spi-sunxi.c
@@ -514,7 +514,7 @@ static int sun4i_spi_probe(struct udevice *bus)
 	return 0;
 }
 
-static int sun4i_spi_ofdata_to_platdata(struct udevice *bus)
+static int sun4i_spi_of_to_plat(struct udevice *bus)
 {
 	struct sun4i_spi_platdata *plat = dev_get_plat(bus);
 	int node = dev_of_offset(bus);
@@ -630,7 +630,7 @@ U_BOOT_DRIVER(sun4i_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match	= sun4i_spi_ids,
 	.ops	= &sun4i_spi_ops,
-	.ofdata_to_platdata	= sun4i_spi_ofdata_to_platdata,
+	.of_to_plat	= sun4i_spi_of_to_plat,
 	.plat_auto	= sizeof(struct sun4i_spi_platdata),
 	.priv_auto	= sizeof(struct sun4i_spi_priv),
 	.probe	= sun4i_spi_probe,
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index 6d3802c97c4..d6f67b28bdb 100644
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -158,7 +158,7 @@ static int spi_child_post_bind(struct udevice *dev)
 	if (!dev_of_valid(dev))
 		return 0;
 
-	return spi_slave_ofdata_to_platdata(dev, plat);
+	return spi_slave_of_to_plat(dev, plat);
 }
 #endif
 
@@ -431,8 +431,8 @@ void spi_free_slave(struct spi_slave *slave)
 	slave->dev = NULL;
 }
 
-int spi_slave_ofdata_to_platdata(struct udevice *dev,
-				 struct dm_spi_slave_platdata *plat)
+int spi_slave_of_to_plat(struct udevice *dev,
+			 struct dm_spi_slave_platdata *plat)
 {
 	int mode = 0;
 	int value;
diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c
index e6cca9ad898..3df7521771a 100644
--- a/drivers/spi/tegra114_spi.c
+++ b/drivers/spi/tegra114_spi.c
@@ -97,7 +97,7 @@ struct tegra114_spi_priv {
 	int last_transaction_us;
 };
 
-static int tegra114_spi_ofdata_to_platdata(struct udevice *bus)
+static int tegra114_spi_of_to_plat(struct udevice *bus)
 {
 	struct tegra_spi_platdata *plat = bus->plat;
 
@@ -393,7 +393,7 @@ U_BOOT_DRIVER(tegra114_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = tegra114_spi_ids,
 	.ops	= &tegra114_spi_ops,
-	.ofdata_to_platdata = tegra114_spi_ofdata_to_platdata,
+	.of_to_plat = tegra114_spi_of_to_plat,
 	.plat_auto	= sizeof(struct tegra_spi_platdata),
 	.priv_auto	= sizeof(struct tegra114_spi_priv),
 	.probe	= tegra114_spi_probe,
diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c
index 4360459792d..7fab2b7504e 100644
--- a/drivers/spi/tegra20_sflash.c
+++ b/drivers/spi/tegra20_sflash.c
@@ -87,7 +87,7 @@ int tegra20_sflash_cs_info(struct udevice *bus, unsigned int cs,
 		return 0;
 }
 
-static int tegra20_sflash_ofdata_to_platdata(struct udevice *bus)
+static int tegra20_sflash_of_to_plat(struct udevice *bus)
 {
 	struct tegra_spi_platdata *plat = bus->plat;
 	const void *blob = gd->fdt_blob;
@@ -353,7 +353,7 @@ U_BOOT_DRIVER(tegra20_sflash) = {
 	.id	= UCLASS_SPI,
 	.of_match = tegra20_sflash_ids,
 	.ops	= &tegra20_sflash_ops,
-	.ofdata_to_platdata = tegra20_sflash_ofdata_to_platdata,
+	.of_to_plat = tegra20_sflash_of_to_plat,
 	.plat_auto	= sizeof(struct tegra_spi_platdata),
 	.priv_auto	= sizeof(struct tegra20_sflash_priv),
 	.probe	= tegra20_sflash_probe,
diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c
index 2bb387ff243..0d7c79bf07b 100644
--- a/drivers/spi/tegra20_slink.c
+++ b/drivers/spi/tegra20_slink.c
@@ -93,7 +93,7 @@ struct tegra_spi_slave {
 	struct tegra30_spi_priv *ctrl;
 };
 
-static int tegra30_spi_ofdata_to_platdata(struct udevice *bus)
+static int tegra30_spi_of_to_plat(struct udevice *bus)
 {
 	struct tegra_spi_platdata *plat = bus->plat;
 	const void *blob = gd->fdt_blob;
@@ -372,7 +372,7 @@ U_BOOT_DRIVER(tegra30_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = tegra30_spi_ids,
 	.ops	= &tegra30_spi_ops,
-	.ofdata_to_platdata = tegra30_spi_ofdata_to_platdata,
+	.of_to_plat = tegra30_spi_of_to_plat,
 	.plat_auto	= sizeof(struct tegra_spi_platdata),
 	.priv_auto	= sizeof(struct tegra30_spi_priv),
 	.probe	= tegra30_spi_probe,
diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c
index 2107d69f183..6902d953637 100644
--- a/drivers/spi/tegra210_qspi.c
+++ b/drivers/spi/tegra210_qspi.c
@@ -97,7 +97,7 @@ struct tegra210_qspi_priv {
 	int last_transaction_us;
 };
 
-static int tegra210_qspi_ofdata_to_platdata(struct udevice *bus)
+static int tegra210_qspi_of_to_plat(struct udevice *bus)
 {
 	struct tegra_spi_platdata *plat = bus->plat;
 
@@ -422,7 +422,7 @@ U_BOOT_DRIVER(tegra210_qspi) = {
 	.id = UCLASS_SPI,
 	.of_match = tegra210_qspi_ids,
 	.ops = &tegra210_qspi_ops,
-	.ofdata_to_platdata = tegra210_qspi_ofdata_to_platdata,
+	.of_to_plat = tegra210_qspi_of_to_plat,
 	.plat_auto	= sizeof(struct tegra_spi_platdata),
 	.priv_auto	= sizeof(struct tegra210_qspi_priv),
 	.per_child_auto	= sizeof(struct spi_slave),
diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c
index 20fe581934c..f1511c08034 100644
--- a/drivers/spi/ti_qspi.c
+++ b/drivers/spi/ti_qspi.c
@@ -452,7 +452,7 @@ static void *map_syscon_chipselects(struct udevice *bus)
 #endif
 }
 
-static int ti_qspi_ofdata_to_platdata(struct udevice *bus)
+static int ti_qspi_of_to_plat(struct udevice *bus)
 {
 	struct ti_qspi_priv *priv = dev_get_priv(bus);
 	const void *blob = gd->fdt_blob;
@@ -504,7 +504,7 @@ U_BOOT_DRIVER(ti_qspi) = {
 	.id	= UCLASS_SPI,
 	.of_match = ti_qspi_ids,
 	.ops	= &ti_qspi_ops,
-	.ofdata_to_platdata = ti_qspi_ofdata_to_platdata,
+	.of_to_plat = ti_qspi_of_to_plat,
 	.priv_auto	= sizeof(struct ti_qspi_priv),
 	.probe	= ti_qspi_probe,
 };
diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c
index 6d9fd3fbd8b..b6083e6ffca 100644
--- a/drivers/spi/uniphier_spi.c
+++ b/drivers/spi/uniphier_spi.c
@@ -362,7 +362,7 @@ static int uniphier_spi_set_mode(struct udevice *bus, uint mode)
 	return 0;
 }
 
-static int uniphier_spi_ofdata_to_platdata(struct udevice *bus)
+static int uniphier_spi_of_to_plat(struct udevice *bus)
 {
 	struct uniphier_spi_platdata *plat = bus->plat;
 	const void *blob = gd->fdt_blob;
@@ -411,7 +411,7 @@ U_BOOT_DRIVER(uniphier_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = uniphier_spi_ids,
 	.ops	= &uniphier_spi_ops,
-	.ofdata_to_platdata = uniphier_spi_ofdata_to_platdata,
+	.of_to_plat = uniphier_spi_of_to_plat,
 	.plat_auto	= sizeof(struct uniphier_spi_platdata),
 	.priv_auto	= sizeof(struct uniphier_spi_priv),
 	.probe	= uniphier_spi_probe,
diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index ec873e12fc4..8c2fde542dc 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -98,7 +98,7 @@ struct zynq_qspi_priv {
 	unsigned cs_change:1;
 };
 
-static int zynq_qspi_ofdata_to_platdata(struct udevice *bus)
+static int zynq_qspi_of_to_plat(struct udevice *bus)
 {
 	struct zynq_qspi_platdata *plat = bus->plat;
 	const void *blob = gd->fdt_blob;
@@ -666,7 +666,7 @@ U_BOOT_DRIVER(zynq_qspi) = {
 	.id     = UCLASS_SPI,
 	.of_match = zynq_qspi_ids,
 	.ops    = &zynq_qspi_ops,
-	.ofdata_to_platdata = zynq_qspi_ofdata_to_platdata,
+	.of_to_plat = zynq_qspi_of_to_plat,
 	.plat_auto	= sizeof(struct zynq_qspi_platdata),
 	.priv_auto	= sizeof(struct zynq_qspi_priv),
 	.probe  = zynq_qspi_probe,
diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c
index fb61a9a2564..3cdd011c0c7 100644
--- a/drivers/spi/zynq_spi.c
+++ b/drivers/spi/zynq_spi.c
@@ -73,7 +73,7 @@ struct zynq_spi_priv {
 	u32 freq;		/* required frequency */
 };
 
-static int zynq_spi_ofdata_to_platdata(struct udevice *bus)
+static int zynq_spi_of_to_plat(struct udevice *bus)
 {
 	struct zynq_spi_platdata *plat = bus->plat;
 	const void *blob = gd->fdt_blob;
@@ -371,7 +371,7 @@ U_BOOT_DRIVER(zynq_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = zynq_spi_ids,
 	.ops	= &zynq_spi_ops,
-	.ofdata_to_platdata = zynq_spi_ofdata_to_platdata,
+	.of_to_plat = zynq_spi_of_to_plat,
 	.plat_auto	= sizeof(struct zynq_spi_platdata),
 	.priv_auto	= sizeof(struct zynq_spi_priv),
 	.probe	= zynq_spi_probe,
diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
index 07e84da50d4..e3bfc6e74e0 100644
--- a/drivers/spi/zynqmp_gqspi.c
+++ b/drivers/spi/zynqmp_gqspi.c
@@ -175,7 +175,7 @@ struct zynqmp_qspi_priv {
 	unsigned int cs_change:1;
 };
 
-static int zynqmp_qspi_ofdata_to_platdata(struct udevice *bus)
+static int zynqmp_qspi_of_to_plat(struct udevice *bus)
 {
 	struct zynqmp_qspi_platdata *plat = bus->plat;
 
@@ -727,7 +727,7 @@ U_BOOT_DRIVER(zynqmp_qspi) = {
 	.id     = UCLASS_SPI,
 	.of_match = zynqmp_qspi_ids,
 	.ops    = &zynqmp_qspi_ops,
-	.ofdata_to_platdata = zynqmp_qspi_ofdata_to_platdata,
+	.of_to_plat = zynqmp_qspi_of_to_plat,
 	.plat_auto	= sizeof(struct zynqmp_qspi_platdata),
 	.priv_auto	= sizeof(struct zynqmp_qspi_priv),
 	.probe  = zynqmp_qspi_probe,
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index 61af5ac0acf..7c38d6e0527 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -607,7 +607,7 @@ static optee_invoke_fn *get_invoke_func(struct udevice *dev)
 	return ERR_PTR(-EINVAL);
 }
 
-static int optee_ofdata_to_platdata(struct udevice *dev)
+static int optee_of_to_plat(struct udevice *dev)
 {
 	struct optee_pdata *pdata = dev_get_plat(dev);
 
@@ -658,7 +658,7 @@ U_BOOT_DRIVER(optee) = {
 	.name = "optee",
 	.id = UCLASS_TEE,
 	.of_match = optee_match,
-	.ofdata_to_platdata = optee_ofdata_to_platdata,
+	.of_to_plat = optee_of_to_plat,
 	.probe = optee_probe,
 	.ops = &optee_ops,
 	.plat_auto	= sizeof(struct optee_pdata),
diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c
index 00058002019..b785be7bd05 100644
--- a/drivers/thermal/imx_scu_thermal.c
+++ b/drivers/thermal/imx_scu_thermal.c
@@ -126,7 +126,7 @@ static int imx_sc_thermal_bind(struct udevice *dev)
 	return 0;
 }
 
-static int imx_sc_thermal_ofdata_to_platdata(struct udevice *dev)
+static int imx_sc_thermal_of_to_plat(struct udevice *dev)
 {
 	struct imx_sc_thermal_plat *pdata = dev_get_plat(dev);
 	struct fdtdec_phandle_args args;
@@ -210,7 +210,7 @@ U_BOOT_DRIVER(imx_sc_thermal) = {
 	.of_match = imx_sc_thermal_ids,
 	.bind = imx_sc_thermal_bind,
 	.probe	= imx_sc_thermal_probe,
-	.ofdata_to_platdata = imx_sc_thermal_ofdata_to_platdata,
+	.of_to_plat = imx_sc_thermal_of_to_plat,
 	.plat_auto	= sizeof(struct imx_sc_thermal_plat),
 	.flags  = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/timer/ag101p_timer.c b/drivers/timer/ag101p_timer.c
index d500ba1101d..bc99fdeac93 100644
--- a/drivers/timer/ag101p_timer.c
+++ b/drivers/timer/ag101p_timer.c
@@ -88,7 +88,7 @@ static int atftmr_timer_probe(struct udevice *dev)
 	return 0;
 }
 
-static int atftme_timer_ofdata_to_platdata(struct udevice *dev)
+static int atftme_timer_of_to_plat(struct udevice *dev)
 {
 	struct atftmr_timer_platdata *plat = dev_get_plat(dev);
 	plat->regs = map_physmem(dev_read_addr(dev),
@@ -110,7 +110,7 @@ U_BOOT_DRIVER(altera_timer) = {
 	.name	= "ag101p_timer",
 	.id	= UCLASS_TIMER,
 	.of_match = ag101p_timer_ids,
-	.ofdata_to_platdata = atftme_timer_ofdata_to_platdata,
+	.of_to_plat = atftme_timer_of_to_plat,
 	.plat_auto	= sizeof(struct atftmr_timer_platdata),
 	.probe = atftmr_timer_probe,
 	.ops	= &ag101p_timer_ops,
diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c
index 1daa0eac5c1..a8d6ba53b89 100644
--- a/drivers/timer/altera_timer.c
+++ b/drivers/timer/altera_timer.c
@@ -63,7 +63,7 @@ static int altera_timer_probe(struct udevice *dev)
 	return 0;
 }
 
-static int altera_timer_ofdata_to_platdata(struct udevice *dev)
+static int altera_timer_of_to_plat(struct udevice *dev)
 {
 	struct altera_timer_platdata *plat = dev_get_plat(dev);
 
@@ -87,7 +87,7 @@ U_BOOT_DRIVER(altera_timer) = {
 	.name	= "altera_timer",
 	.id	= UCLASS_TIMER,
 	.of_match = altera_timer_ids,
-	.ofdata_to_platdata = altera_timer_ofdata_to_platdata,
+	.of_to_plat = altera_timer_of_to_plat,
 	.plat_auto	= sizeof(struct altera_timer_platdata),
 	.probe = altera_timer_probe,
 	.ops	= &altera_timer_ops,
diff --git a/drivers/timer/ast_timer.c b/drivers/timer/ast_timer.c
index 9ad446054ec..78adc96cc59 100644
--- a/drivers/timer/ast_timer.c
+++ b/drivers/timer/ast_timer.c
@@ -58,7 +58,7 @@ static u64 ast_timer_get_count(struct udevice *dev)
 	return AST_TMC_RELOAD_VAL - readl(&priv->tmc->status);
 }
 
-static int ast_timer_ofdata_to_platdata(struct udevice *dev)
+static int ast_timer_of_to_plat(struct udevice *dev)
 {
 	struct ast_timer_priv *priv = dev_get_priv(dev);
 
@@ -87,6 +87,6 @@ U_BOOT_DRIVER(ast_timer) = {
 	.of_match = ast_timer_ids,
 	.probe = ast_timer_probe,
 	.priv_auto	= sizeof(struct ast_timer_priv),
-	.ofdata_to_platdata = ast_timer_ofdata_to_platdata,
+	.of_to_plat = ast_timer_of_to_plat,
 	.ops = &ast_timer_ops,
 };
diff --git a/drivers/timer/atcpit100_timer.c b/drivers/timer/atcpit100_timer.c
index 47185a8fd26..16d03c41efe 100644
--- a/drivers/timer/atcpit100_timer.c
+++ b/drivers/timer/atcpit100_timer.c
@@ -85,7 +85,7 @@ static int atcpit_timer_probe(struct udevice *dev)
 	return 0;
 }
 
-static int atcpit_timer_ofdata_to_platdata(struct udevice *dev)
+static int atcpit_timer_of_to_plat(struct udevice *dev)
 {
 	struct atcpit_timer_platdata *plat = dev_get_plat(dev);
 	plat->regs = map_physmem(dev_read_addr(dev), 0x100 , MAP_NOCACHE);
@@ -105,7 +105,7 @@ U_BOOT_DRIVER(atcpit100_timer) = {
 	.name	= "atcpit100_timer",
 	.id	= UCLASS_TIMER,
 	.of_match = atcpit_timer_ids,
-	.ofdata_to_platdata = atcpit_timer_ofdata_to_platdata,
+	.of_to_plat = atcpit_timer_of_to_plat,
 	.plat_auto	= sizeof(struct atcpit_timer_platdata),
 	.probe = atcpit_timer_probe,
 	.ops	= &atcpit_timer_ops,
diff --git a/drivers/timer/atmel_pit_timer.c b/drivers/timer/atmel_pit_timer.c
index d88a05a201f..7b445dfe062 100644
--- a/drivers/timer/atmel_pit_timer.c
+++ b/drivers/timer/atmel_pit_timer.c
@@ -58,7 +58,7 @@ static int atmel_pit_probe(struct udevice *dev)
 	return 0;
 }
 
-static int atmel_pit_ofdata_to_platdata(struct udevice *dev)
+static int atmel_pit_of_to_plat(struct udevice *dev)
 {
 	struct atmel_pit_platdata *plat = dev_get_plat(dev);
 
@@ -80,7 +80,7 @@ U_BOOT_DRIVER(atmel_pit) = {
 	.name	= "atmel_pit",
 	.id	= UCLASS_TIMER,
 	.of_match = atmel_pit_ids,
-	.ofdata_to_platdata = atmel_pit_ofdata_to_platdata,
+	.of_to_plat = atmel_pit_of_to_plat,
 	.plat_auto	= sizeof(struct atmel_pit_platdata),
 	.probe	= atmel_pit_probe,
 	.ops	= &atmel_pit_ops,
diff --git a/drivers/timer/cadence-ttc.c b/drivers/timer/cadence-ttc.c
index 7107bf2472a..3cac2ec4220 100644
--- a/drivers/timer/cadence-ttc.c
+++ b/drivers/timer/cadence-ttc.c
@@ -84,7 +84,7 @@ static int cadence_ttc_probe(struct udevice *dev)
 	return 0;
 }
 
-static int cadence_ttc_ofdata_to_platdata(struct udevice *dev)
+static int cadence_ttc_of_to_plat(struct udevice *dev)
 {
 	struct cadence_ttc_priv *priv = dev_get_priv(dev);
 
@@ -109,7 +109,7 @@ U_BOOT_DRIVER(cadence_ttc) = {
 	.name = "cadence_ttc",
 	.id = UCLASS_TIMER,
 	.of_match = cadence_ttc_ids,
-	.ofdata_to_platdata = cadence_ttc_ofdata_to_platdata,
+	.of_to_plat = cadence_ttc_of_to_plat,
 	.priv_auto	= sizeof(struct cadence_ttc_priv),
 	.probe = cadence_ttc_probe,
 	.ops = &cadence_ttc_ops,
diff --git a/drivers/timer/dw-apb-timer.c b/drivers/timer/dw-apb-timer.c
index 8ef36d4c2b6..9aed5dd217a 100644
--- a/drivers/timer/dw-apb-timer.c
+++ b/drivers/timer/dw-apb-timer.c
@@ -66,7 +66,7 @@ static int dw_apb_timer_probe(struct udevice *dev)
 	return 0;
 }
 
-static int dw_apb_timer_ofdata_to_platdata(struct udevice *dev)
+static int dw_apb_timer_of_to_plat(struct udevice *dev)
 {
 	struct dw_apb_timer_priv *priv = dev_get_priv(dev);
 
@@ -97,7 +97,7 @@ U_BOOT_DRIVER(dw_apb_timer) = {
 	.ops		= &dw_apb_timer_ops,
 	.probe		= dw_apb_timer_probe,
 	.of_match	= dw_apb_timer_ids,
-	.ofdata_to_platdata = dw_apb_timer_ofdata_to_platdata,
+	.of_to_plat = dw_apb_timer_of_to_plat,
 	.remove		= dw_apb_timer_remove,
 	.priv_auto	= sizeof(struct dw_apb_timer_priv),
 };
diff --git a/drivers/timer/omap-timer.c b/drivers/timer/omap-timer.c
index a1029ac5061..7ac20d78dd8 100644
--- a/drivers/timer/omap-timer.c
+++ b/drivers/timer/omap-timer.c
@@ -73,7 +73,7 @@ static int omap_timer_probe(struct udevice *dev)
 	return 0;
 }
 
-static int omap_timer_ofdata_to_platdata(struct udevice *dev)
+static int omap_timer_of_to_plat(struct udevice *dev)
 {
 	struct omap_timer_priv *priv = dev_get_priv(dev);
 
@@ -99,7 +99,7 @@ U_BOOT_DRIVER(omap_timer) = {
 	.name	= "omap_timer",
 	.id	= UCLASS_TIMER,
 	.of_match = omap_timer_ids,
-	.ofdata_to_platdata = omap_timer_ofdata_to_platdata,
+	.of_to_plat = omap_timer_of_to_plat,
 	.priv_auto	= sizeof(struct omap_timer_priv),
 	.probe = omap_timer_probe,
 	.ops	= &omap_timer_ops,
diff --git a/drivers/timer/ostm_timer.c b/drivers/timer/ostm_timer.c
index 261cac5de38..99bd36f9f25 100644
--- a/drivers/timer/ostm_timer.c
+++ b/drivers/timer/ostm_timer.c
@@ -63,7 +63,7 @@ static int ostm_probe(struct udevice *dev)
 	return 0;
 }
 
-static int ostm_ofdata_to_platdata(struct udevice *dev)
+static int ostm_of_to_plat(struct udevice *dev)
 {
 	struct ostm_priv *priv = dev_get_priv(dev);
 
@@ -87,6 +87,6 @@ U_BOOT_DRIVER(ostm_timer) = {
 	.ops		= &ostm_ops,
 	.probe		= ostm_probe,
 	.of_match	= ostm_ids,
-	.ofdata_to_platdata = ostm_ofdata_to_platdata,
+	.of_to_plat = ostm_of_to_plat,
 	.priv_auto	= sizeof(struct ostm_priv),
 };
diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c
index 8b727b652a2..8d3eceb8d8d 100644
--- a/drivers/timer/rockchip_timer.c
+++ b/drivers/timer/rockchip_timer.c
@@ -97,7 +97,7 @@ static u64 rockchip_timer_get_count(struct udevice *dev)
 	return ~0ull - cntr;
 }
 
-static int rockchip_clk_ofdata_to_platdata(struct udevice *dev)
+static int rockchip_clk_of_to_plat(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct rockchip_timer_priv *priv = dev_get_priv(dev);
@@ -169,5 +169,5 @@ U_BOOT_DRIVER(rockchip_rk3368_timer) = {
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
 	.plat_auto	= sizeof(struct rockchip_timer_plat),
 #endif
-	.ofdata_to_platdata = rockchip_clk_ofdata_to_platdata,
+	.of_to_plat = rockchip_clk_of_to_plat,
 };
diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
index 71edfbfaefd..ce61b72d222 100644
--- a/drivers/tpm/cr50_i2c.c
+++ b/drivers/tpm/cr50_i2c.c
@@ -637,7 +637,7 @@ enum {
 	LONG_TIMEOUT_MS		= 2000,
 };
 
-static int cr50_i2c_ofdata_to_platdata(struct udevice *dev)
+static int cr50_i2c_of_to_plat(struct udevice *dev)
 {
 	struct tpm_chip_priv *upriv = dev_get_uclass_priv(dev);
 	struct cr50_priv *priv = dev_get_priv(dev);
@@ -725,7 +725,7 @@ U_BOOT_DRIVER(cr50_i2c) = {
 	.id     = UCLASS_TPM,
 	.of_match = cr50_i2c_ids,
 	.ops    = &cr50_i2c_ops,
-	.ofdata_to_platdata	= cr50_i2c_ofdata_to_platdata,
+	.of_to_plat	= cr50_i2c_of_to_plat,
 	.probe	= cr50_i2c_probe,
 	.remove	= cr50_i2c_cleanup,
 	.priv_auto	= sizeof(struct cr50_priv),
diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c
index 0bfdaa0b075..459add80c58 100644
--- a/drivers/usb/dwc3/dwc3-generic.c
+++ b/drivers/usb/dwc3/dwc3-generic.c
@@ -105,7 +105,7 @@ static int dwc3_generic_remove(struct udevice *dev,
 	return 0;
 }
 
-static int dwc3_generic_ofdata_to_platdata(struct udevice *dev)
+static int dwc3_generic_of_to_plat(struct udevice *dev)
 {
 	struct dwc3_generic_plat *plat = dev_get_plat(dev);
 	ofnode node = dev->node;
@@ -155,7 +155,7 @@ static int dwc3_generic_peripheral_remove(struct udevice *dev)
 U_BOOT_DRIVER(dwc3_generic_peripheral) = {
 	.name	= "dwc3-generic-peripheral",
 	.id	= UCLASS_USB_GADGET_GENERIC,
-	.ofdata_to_platdata = dwc3_generic_ofdata_to_platdata,
+	.of_to_plat = dwc3_generic_of_to_plat,
 	.probe = dwc3_generic_peripheral_probe,
 	.remove = dwc3_generic_peripheral_remove,
 	.priv_auto	= sizeof(struct dwc3_generic_priv),
@@ -197,7 +197,7 @@ static int dwc3_generic_host_remove(struct udevice *dev)
 U_BOOT_DRIVER(dwc3_generic_host) = {
 	.name	= "dwc3-generic-host",
 	.id	= UCLASS_USB,
-	.ofdata_to_platdata = dwc3_generic_ofdata_to_platdata,
+	.of_to_plat = dwc3_generic_of_to_plat,
 	.probe = dwc3_generic_host_probe,
 	.remove = dwc3_generic_host_remove,
 	.priv_auto	= sizeof(struct dwc3_generic_host_priv),
diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c
index 67c23200dda..edabc1b3a7a 100644
--- a/drivers/usb/emul/sandbox_flash.c
+++ b/drivers/usb/emul/sandbox_flash.c
@@ -366,7 +366,7 @@ err:
 	return 0;
 }
 
-static int sandbox_flash_ofdata_to_platdata(struct udevice *dev)
+static int sandbox_flash_of_to_plat(struct udevice *dev)
 {
 	struct sandbox_flash_plat *plat = dev_get_plat(dev);
 
@@ -419,7 +419,7 @@ U_BOOT_DRIVER(usb_sandbox_flash) = {
 	.of_match = sandbox_usb_flash_ids,
 	.bind	= sandbox_flash_bind,
 	.probe	= sandbox_flash_probe,
-	.ofdata_to_platdata = sandbox_flash_ofdata_to_platdata,
+	.of_to_plat = sandbox_flash_of_to_plat,
 	.ops	= &sandbox_usb_flash_ops,
 	.priv_auto	= sizeof(struct sandbox_flash_priv),
 	.plat_auto	= sizeof(struct sandbox_flash_plat),
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index 2d5b7dc83f4..4771b1e9312 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -980,7 +980,7 @@ static void dwc2_phy_shutdown(struct udevice *dev, struct phy_bulk *phys)
 	generic_phy_exit_bulk(phys);
 }
 
-static int dwc2_udc_otg_ofdata_to_platdata(struct udevice *dev)
+static int dwc2_udc_otg_of_to_plat(struct udevice *dev)
 {
 	struct dwc2_plat_otg_data *plat = dev_get_plat(dev);
 	ulong drvdata;
@@ -1185,7 +1185,7 @@ U_BOOT_DRIVER(dwc2_udc_otg) = {
 	.name	= "dwc2-udc-otg",
 	.id	= UCLASS_USB_GADGET_GENERIC,
 	.of_match = dwc2_udc_otg_ids,
-	.ofdata_to_platdata = dwc2_udc_otg_ofdata_to_platdata,
+	.of_to_plat = dwc2_udc_otg_of_to_plat,
 	.probe = dwc2_udc_otg_probe,
 	.remove = dwc2_udc_otg_remove,
 	.plat_auto	= sizeof(struct dwc2_plat_otg_data),
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index 40d389cbd6a..ec643e9f45b 100644
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -1326,7 +1326,7 @@ static int dwc2_submit_int_msg(struct udevice *dev, struct usb_device *udev,
 			       nonblock);
 }
 
-static int dwc2_usb_ofdata_to_platdata(struct udevice *dev)
+static int dwc2_usb_of_to_plat(struct udevice *dev)
 {
 	struct dwc2_priv *priv = dev_get_priv(dev);
 
@@ -1473,7 +1473,7 @@ U_BOOT_DRIVER(usb_dwc2) = {
 	.name	= "dwc2_usb",
 	.id	= UCLASS_USB,
 	.of_match = dwc2_usb_ids,
-	.ofdata_to_platdata = dwc2_usb_ofdata_to_platdata,
+	.of_to_plat = dwc2_usb_of_to_plat,
 	.probe	= dwc2_usb_probe,
 	.remove = dwc2_usb_remove,
 	.ops	= &dwc2_usb_ops,
diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c
index 90266c725f0..660a145e4db 100644
--- a/drivers/usb/host/dwc3-sti-glue.c
+++ b/drivers/usb/host/dwc3-sti-glue.c
@@ -100,7 +100,7 @@ static void sti_dwc3_glue_init(struct sti_dwc3_glue_platdata *plat)
 	setbits_le32(plat->glue_base + CLKRST_CTRL, SW_PIPEW_RESET_N);
 }
 
-static int sti_dwc3_glue_ofdata_to_platdata(struct udevice *dev)
+static int sti_dwc3_glue_of_to_plat(struct udevice *dev)
 {
 	struct sti_dwc3_glue_platdata *plat = dev_get_plat(dev);
 	struct udevice *syscon;
@@ -242,7 +242,7 @@ U_BOOT_DRIVER(dwc3_sti_glue) = {
 	.name = "dwc3_sti_glue",
 	.id = UCLASS_NOP,
 	.of_match = sti_dwc3_glue_ids,
-	.ofdata_to_platdata = sti_dwc3_glue_ofdata_to_platdata,
+	.of_to_plat = sti_dwc3_glue_of_to_plat,
 	.probe = sti_dwc3_glue_probe,
 	.remove = sti_dwc3_glue_remove,
 	.bind = sti_dwc3_glue_bind,
diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c
index 0a3983b429f..690a96c5bd2 100644
--- a/drivers/usb/host/ehci-exynos.c
+++ b/drivers/usb/host/ehci-exynos.c
@@ -43,7 +43,7 @@ struct exynos_ehci {
 	struct ehci_hccr *hcd;
 };
 
-static int ehci_usb_ofdata_to_platdata(struct udevice *dev)
+static int ehci_usb_of_to_plat(struct udevice *dev)
 {
 	struct exynos_ehci_platdata *plat = dev_get_plat(dev);
 	const void *blob = gd->fdt_blob;
@@ -254,7 +254,7 @@ U_BOOT_DRIVER(usb_ehci) = {
 	.name	= "ehci_exynos",
 	.id	= UCLASS_USB,
 	.of_match = ehci_usb_ids,
-	.ofdata_to_platdata = ehci_usb_ofdata_to_platdata,
+	.of_to_plat = ehci_usb_of_to_plat,
 	.probe = ehci_usb_probe,
 	.remove = ehci_usb_remove,
 	.ops	= &ehci_usb_ops,
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 9824b7b190b..dfeca8915bf 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -58,7 +58,7 @@ static int usb_phy_clk_valid(struct usb_ehci *ehci)
 }
 
 #if CONFIG_IS_ENABLED(DM_USB)
-static int ehci_fsl_ofdata_to_platdata(struct udevice *dev)
+static int ehci_fsl_of_to_plat(struct udevice *dev)
 {
 	struct ehci_fsl_priv *priv = dev_get_priv(dev);
 	const void *prop;
@@ -141,7 +141,7 @@ U_BOOT_DRIVER(ehci_fsl) = {
 	.name	= "ehci_fsl",
 	.id	= UCLASS_USB,
 	.of_match = ehci_usb_ids,
-	.ofdata_to_platdata = ehci_fsl_ofdata_to_platdata,
+	.of_to_plat = ehci_fsl_of_to_plat,
 	.probe = ehci_fsl_probe,
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 6143de22668..a3405d02e5c 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -101,7 +101,7 @@ static int ehci_usb_remove(struct udevice *dev)
 	return 0;
 }
 
-static int ehci_usb_ofdata_to_platdata(struct udevice *dev)
+static int ehci_usb_of_to_plat(struct udevice *dev)
 {
 	struct msm_ehci_priv *priv = dev_get_priv(dev);
 
@@ -140,7 +140,7 @@ U_BOOT_DRIVER(usb_ehci) = {
 	.name	= "ehci_msm",
 	.id	= UCLASS_USB,
 	.of_match = ehci_usb_ids,
-	.ofdata_to_platdata = ehci_usb_ofdata_to_platdata,
+	.of_to_plat = ehci_usb_of_to_plat,
 	.probe = ehci_usb_probe,
 	.remove = ehci_usb_remove,
 	.ops	= &ehci_usb_ops,
diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index abefdfafac4..b21a953d706 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -285,7 +285,7 @@ static const struct ehci_ops mx5_ehci_ops = {
 	.powerup_fixup		= mx5_ehci_powerup_fixup,
 };
 
-static int ehci_usb_ofdata_to_platdata(struct udevice *dev)
+static int ehci_usb_of_to_plat(struct udevice *dev)
 {
 	struct usb_platdata *plat = dev_get_plat(dev);
 	const char *mode;
@@ -363,7 +363,7 @@ U_BOOT_DRIVER(usb_mx5) = {
 	.name	= "ehci_mx5",
 	.id	= UCLASS_USB,
 	.of_match = mx5_usb_ids,
-	.ofdata_to_platdata = ehci_usb_ofdata_to_platdata,
+	.of_to_plat = ehci_usb_of_to_plat,
 	.probe	= ehci_usb_probe,
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 8b8513d3a9a..3d3bd0e1145 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -518,7 +518,7 @@ static int ehci_usb_phy_mode(struct udevice *dev)
 	return 0;
 }
 
-static int ehci_usb_ofdata_to_platdata(struct udevice *dev)
+static int ehci_usb_of_to_plat(struct udevice *dev)
 {
 	struct usb_platdata *plat = dev_get_plat(dev);
 	enum usb_dr_mode dr_mode;
@@ -651,7 +651,7 @@ U_BOOT_DRIVER(usb_mx6) = {
 	.name	= "ehci_mx6",
 	.id	= UCLASS_USB,
 	.of_match = mx6_usb_ids,
-	.ofdata_to_platdata = ehci_usb_ofdata_to_platdata,
+	.of_to_plat = ehci_usb_of_to_plat,
 	.bind	= ehci_usb_bind,
 	.probe	= ehci_usb_probe,
 	.remove = ehci_deregister,
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 48de33c5df3..49845c1ee9e 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -366,7 +366,7 @@ struct ehci_omap_priv_data {
 	int nports;
 };
 
-static int ehci_usb_ofdata_to_platdata(struct udevice *dev)
+static int ehci_usb_of_to_plat(struct udevice *dev)
 {
 	struct usb_platdata *plat = dev_get_plat(dev);
 
@@ -402,7 +402,7 @@ U_BOOT_DRIVER(usb_omap_ehci) = {
 	.id	= UCLASS_USB,
 	.of_match = omap_ehci_dt_ids,
 	.probe = omap_ehci_probe,
-	.ofdata_to_platdata = ehci_usb_ofdata_to_platdata,
+	.of_to_plat = ehci_usb_of_to_plat,
 	.plat_auto	= sizeof(struct usb_platdata),
 	.priv_auto	= sizeof(struct ehci_omap_priv_data),
 	.remove = ehci_deregister,
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 68a49046e77..c16eec3558e 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -812,7 +812,7 @@ static const struct ehci_ops tegra_ehci_ops = {
 	.powerup_fixup		= tegra_ehci_powerup_fixup,
 };
 
-static int ehci_usb_ofdata_to_platdata(struct udevice *dev)
+static int ehci_usb_of_to_plat(struct udevice *dev)
 {
 	struct fdt_usb *priv = dev_get_priv(dev);
 	int ret;
@@ -861,7 +861,7 @@ U_BOOT_DRIVER(usb_ehci) = {
 	.name	= "ehci_tegra",
 	.id	= UCLASS_USB,
 	.of_match = ehci_usb_ids,
-	.ofdata_to_platdata = ehci_usb_ofdata_to_platdata,
+	.of_to_plat = ehci_usb_of_to_plat,
 	.probe = ehci_usb_probe,
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c
index bd01ea07508..e1a4b3438fc 100644
--- a/drivers/usb/host/ehci-vf.c
+++ b/drivers/usb/host/ehci-vf.c
@@ -215,7 +215,7 @@ struct ehci_vf_priv_data {
 	u32 portnr;
 };
 
-static int vf_usb_ofdata_to_platdata(struct udevice *dev)
+static int vf_usb_of_to_plat(struct udevice *dev)
 {
 	struct ehci_vf_priv_data *priv = dev_get_priv(dev);
 	const void *dt_blob = gd->fdt_blob;
@@ -352,7 +352,7 @@ U_BOOT_DRIVER(usb_ehci) = {
 	.probe = ehci_usb_probe,
 	.remove = ehci_deregister,
 	.ops = &ehci_usb_ops,
-	.ofdata_to_platdata = vf_usb_ofdata_to_platdata,
+	.of_to_plat = vf_usb_of_to_plat,
 	.plat_auto	= sizeof(struct usb_platdata),
 	.priv_auto	= sizeof(struct ehci_vf_priv_data),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
diff --git a/drivers/usb/host/ehci-zynq.c b/drivers/usb/host/ehci-zynq.c
index 7a7cfaa44de..6756465d647 100644
--- a/drivers/usb/host/ehci-zynq.c
+++ b/drivers/usb/host/ehci-zynq.c
@@ -21,7 +21,7 @@ struct zynq_ehci_priv {
 	struct usb_ehci *ehci;
 };
 
-static int ehci_zynq_ofdata_to_platdata(struct udevice *dev)
+static int ehci_zynq_of_to_plat(struct udevice *dev)
 {
 	struct zynq_ehci_priv *priv = dev_get_priv(dev);
 
@@ -81,7 +81,7 @@ U_BOOT_DRIVER(ehci_zynq) = {
 	.name	= "ehci_zynq",
 	.id	= UCLASS_USB,
 	.of_match = ehci_zynq_ids,
-	.ofdata_to_platdata = ehci_zynq_ofdata_to_platdata,
+	.of_to_plat = ehci_zynq_of_to_plat,
 	.probe = ehci_zynq_probe,
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 7620ac2da79..f1fc93f3d40 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -805,7 +805,7 @@ static int r8a66597_submit_bulk_msg(struct udevice *udev,
 	return ret;
 }
 
-static int r8a66597_usb_ofdata_to_platdata(struct udevice *dev)
+static int r8a66597_usb_of_to_plat(struct udevice *dev)
 {
 	struct r8a66597 *priv = dev_get_priv(dev);
 	fdt_addr_t addr;
@@ -890,7 +890,7 @@ U_BOOT_DRIVER(usb_r8a66597) = {
 	.name	= "r8a66597_usb",
 	.id	= UCLASS_USB,
 	.of_match = r8a66597_usb_ids,
-	.ofdata_to_platdata = r8a66597_usb_ofdata_to_platdata,
+	.of_to_plat = r8a66597_usb_of_to_plat,
 	.probe	= r8a66597_usb_probe,
 	.remove = r8a66597_usb_remove,
 	.ops	= &r8a66597_usb_ops,
diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c
index 4d3dd360bf6..fe804a0dfe2 100644
--- a/drivers/usb/host/xhci-exynos5.c
+++ b/drivers/usb/host/xhci-exynos5.c
@@ -52,7 +52,7 @@ struct exynos_xhci {
 	struct dwc3 *dwc3_reg;
 };
 
-static int xhci_usb_ofdata_to_platdata(struct udevice *dev)
+static int xhci_usb_of_to_plat(struct udevice *dev)
 {
 	struct exynos_xhci_platdata *plat = dev_get_plat(dev);
 	const void *blob = gd->fdt_blob;
@@ -251,7 +251,7 @@ U_BOOT_DRIVER(usb_xhci) = {
 	.name	= "xhci_exynos",
 	.id	= UCLASS_USB,
 	.of_match = xhci_usb_ids,
-	.ofdata_to_platdata = xhci_usb_ofdata_to_platdata,
+	.of_to_plat = xhci_usb_of_to_plat,
 	.probe = xhci_usb_probe,
 	.remove = xhci_usb_remove,
 	.ops	= &xhci_usb_ops,
diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c
index ffecfc28ef6..017f99b6293 100644
--- a/drivers/usb/host/xhci-mvebu.c
+++ b/drivers/usb/host/xhci-mvebu.c
@@ -65,7 +65,7 @@ static int xhci_usb_probe(struct udevice *dev)
 	return xhci_register(dev, ctx->hcd, hcor);
 }
 
-static int xhci_usb_ofdata_to_platdata(struct udevice *dev)
+static int xhci_usb_of_to_plat(struct udevice *dev)
 {
 	struct mvebu_xhci_platdata *plat = dev_get_plat(dev);
 
@@ -92,7 +92,7 @@ U_BOOT_DRIVER(usb_xhci) = {
 	.name	= "xhci_mvebu",
 	.id	= UCLASS_USB,
 	.of_match = xhci_usb_ids,
-	.ofdata_to_platdata = xhci_usb_ofdata_to_platdata,
+	.of_to_plat = xhci_usb_of_to_plat,
 	.probe = xhci_usb_probe,
 	.remove = xhci_deregister,
 	.ops	= &xhci_usb_ops,
diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index 22dfaf49b7d..dc941a2068c 100644
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -132,7 +132,7 @@ static int xhci_rcar_deregister(struct udevice *dev)
 	return ret;
 }
 
-static int xhci_rcar_ofdata_to_platdata(struct udevice *dev)
+static int xhci_rcar_of_to_plat(struct udevice *dev)
 {
 	struct rcar_xhci_platdata *plat = dev_get_plat(dev);
 
@@ -160,7 +160,7 @@ U_BOOT_DRIVER(usb_xhci) = {
 	.remove		= xhci_rcar_deregister,
 	.ops		= &xhci_usb_ops,
 	.of_match	= xhci_rcar_ids,
-	.ofdata_to_platdata = xhci_rcar_ofdata_to_platdata,
+	.of_to_plat = xhci_rcar_of_to_plat,
 	.plat_auto	= sizeof(struct rcar_xhci_platdata),
 	.priv_auto	= sizeof(struct rcar_xhci),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
diff --git a/drivers/usb/musb-new/da8xx.c b/drivers/usb/musb-new/da8xx.c
index d9591b97c39..c59ca544373 100644
--- a/drivers/usb/musb-new/da8xx.c
+++ b/drivers/usb/musb-new/da8xx.c
@@ -256,7 +256,7 @@ struct da8xx_musb_platdata {
 	struct phy phy;
 };
 
-static int da8xx_musb_ofdata_to_platdata(struct udevice *dev)
+static int da8xx_musb_of_to_plat(struct udevice *dev)
 {
 	struct da8xx_musb_platdata *plat = dev_get_plat(dev);
 	const void *fdt = gd->fdt_blob;
@@ -344,7 +344,7 @@ U_BOOT_DRIVER(da8xx_musb) = {
 	.name	= "da8xx-musb",
 	.id		= UCLASS_USB,
 	.of_match = da8xx_musb_ids,
-	.ofdata_to_platdata = da8xx_musb_ofdata_to_platdata,
+	.of_to_plat = da8xx_musb_of_to_plat,
 	.probe = da8xx_musb_probe,
 	.remove = da8xx_musb_remove,
 	.ops = &musb_usb_ops,
diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c
index b09f0d499da..b9bba22a657 100644
--- a/drivers/usb/musb-new/omap2430.c
+++ b/drivers/usb/musb-new/omap2430.c
@@ -149,7 +149,7 @@ struct omap2430_musb_platdata {
 	struct omap_musb_board_data otg_board_data;
 };
 
-static int omap2430_musb_ofdata_to_platdata(struct udevice *dev)
+static int omap2430_musb_of_to_plat(struct udevice *dev)
 {
 	struct omap2430_musb_platdata *plat = dev_get_plat(dev);
 	const void *fdt = gd->fdt_blob;
@@ -269,7 +269,7 @@ U_BOOT_DRIVER(omap2430_musb) = {
 	.id		= UCLASS_USB_GADGET_GENERIC,
 #endif
 	.of_match = omap2430_musb_ids,
-	.ofdata_to_platdata = omap2430_musb_ofdata_to_platdata,
+	.of_to_plat = omap2430_musb_of_to_plat,
 	.probe = omap2430_musb_probe,
 	.remove = omap2430_musb_remove,
 #ifdef CONFIG_USB_MUSB_HOST
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c
index 716e820557d..b0ee57ad8a0 100644
--- a/drivers/usb/musb-new/ti-musb.c
+++ b/drivers/usb/musb-new/ti-musb.c
@@ -77,7 +77,7 @@ static int ti_musb_get_usb_index(int node)
 	return -ENOENT;
 }
 
-static int ti_musb_ofdata_to_platdata(struct udevice *dev)
+static int ti_musb_of_to_plat(struct udevice *dev)
 {
 	struct ti_musb_platdata *plat = dev_get_plat(dev);
 	const void *fdt = gd->fdt_blob;
@@ -176,14 +176,14 @@ static int ti_musb_host_remove(struct udevice *dev)
 }
 
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-static int ti_musb_host_ofdata_to_platdata(struct udevice *dev)
+static int ti_musb_host_of_to_plat(struct udevice *dev)
 {
 	struct ti_musb_platdata *plat = dev_get_plat(dev);
 	const void *fdt = gd->fdt_blob;
 	int node = dev_of_offset(dev);
 	int ret;
 
-	ret = ti_musb_ofdata_to_platdata(dev);
+	ret = ti_musb_of_to_plat(dev);
 	if (ret) {
 		pr_err("plat dt parse error\n");
 		return ret;
@@ -199,7 +199,7 @@ U_BOOT_DRIVER(ti_musb_host) = {
 	.name	= "ti-musb-host",
 	.id	= UCLASS_USB,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-	.ofdata_to_platdata = ti_musb_host_ofdata_to_platdata,
+	.of_to_plat = ti_musb_host_of_to_plat,
 #endif
 	.probe = ti_musb_host_probe,
 	.remove = ti_musb_host_remove,
@@ -214,14 +214,14 @@ struct ti_musb_peripheral {
 };
 
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-static int ti_musb_peripheral_ofdata_to_platdata(struct udevice *dev)
+static int ti_musb_peripheral_of_to_plat(struct udevice *dev)
 {
 	struct ti_musb_platdata *plat = dev_get_plat(dev);
 	const void *fdt = gd->fdt_blob;
 	int node = dev_of_offset(dev);
 	int ret;
 
-	ret = ti_musb_ofdata_to_platdata(dev);
+	ret = ti_musb_of_to_plat(dev);
 	if (ret) {
 		pr_err("plat dt parse error\n");
 		return ret;
@@ -272,7 +272,7 @@ U_BOOT_DRIVER(ti_musb_peripheral) = {
 	.name	= "ti-musb-peripheral",
 	.id	= UCLASS_USB_GADGET_GENERIC,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-	.ofdata_to_platdata = ti_musb_peripheral_ofdata_to_platdata,
+	.of_to_plat = ti_musb_peripheral_of_to_plat,
 #endif
 	.probe = ti_musb_peripheral_probe,
 	.remove = ti_musb_peripheral_remove,
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index 26c6a46d5b7..e0d5f445901 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -498,7 +498,7 @@ static int am335x_fb_probe(struct udevice *dev)
 	return 0;
 }
 
-static int am335x_fb_ofdata_to_platdata(struct udevice *dev)
+static int am335x_fb_of_to_plat(struct udevice *dev)
 {
 	struct am335x_fb_priv *priv = dev_get_priv(dev);
 	struct tilcdc_panel_info *panel = &priv->panel;
@@ -611,7 +611,7 @@ U_BOOT_DRIVER(am335x_fb) = {
 	.id = UCLASS_VIDEO,
 	.of_match = am335x_fb_ids,
 	.bind = am335x_fb_bind,
-	.ofdata_to_platdata = am335x_fb_ofdata_to_platdata,
+	.of_to_plat = am335x_fb_of_to_plat,
 	.probe = am335x_fb_probe,
 	.remove = am335x_fb_remove,
 	.priv_auto	= sizeof(struct am335x_fb_priv),
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index 0930d195d00..2d0d0d4f9c9 100644
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -501,7 +501,7 @@ static int atmel_hlcdc_probe(struct udevice *dev)
 	return 0;
 }
 
-static int atmel_hlcdc_ofdata_to_platdata(struct udevice *dev)
+static int atmel_hlcdc_of_to_plat(struct udevice *dev)
 {
 	struct atmel_hlcdc_priv *priv = dev_get_priv(dev);
 	const void *blob = gd->fdt_blob;
@@ -561,7 +561,7 @@ U_BOOT_DRIVER(atmel_hlcdfb) = {
 	.of_match = atmel_hlcdc_ids,
 	.bind	= atmel_hlcdc_bind,
 	.probe	= atmel_hlcdc_probe,
-	.ofdata_to_platdata = atmel_hlcdc_ofdata_to_platdata,
+	.of_to_plat = atmel_hlcdc_of_to_plat,
 	.priv_auto	= sizeof(struct atmel_hlcdc_priv),
 };
 
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 83367c4b451..f836a9a82ff 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -267,7 +267,7 @@ static int atmel_fb_lcd_probe(struct udevice *dev)
 	return 0;
 }
 
-static int atmel_fb_ofdata_to_platdata(struct udevice *dev)
+static int atmel_fb_of_to_plat(struct udevice *dev)
 {
 	struct atmel_lcd_platdata *plat = dev_get_plat(dev);
 	struct atmel_fb_priv *priv = dev_get_priv(dev);
@@ -304,7 +304,7 @@ U_BOOT_DRIVER(atmel_fb) = {
 	.id	= UCLASS_VIDEO,
 	.of_match = atmel_fb_lcd_ids,
 	.bind	= atmel_fb_lcd_bind,
-	.ofdata_to_platdata	= atmel_fb_ofdata_to_platdata,
+	.of_to_plat	= atmel_fb_of_to_plat,
 	.probe	= atmel_fb_lcd_probe,
 	.plat_auto	= sizeof(struct atmel_lcd_platdata),
 	.priv_auto	= sizeof(struct atmel_fb_priv),
diff --git a/drivers/video/backlight_gpio.c b/drivers/video/backlight_gpio.c
index 8e34022d836..af1f058cf67 100644
--- a/drivers/video/backlight_gpio.c
+++ b/drivers/video/backlight_gpio.c
@@ -24,7 +24,7 @@ static int gpio_backlight_enable(struct udevice *dev)
 	return 0;
 }
 
-static int gpio_backlight_ofdata_to_platdata(struct udevice *dev)
+static int gpio_backlight_of_to_plat(struct udevice *dev)
 {
 	struct gpio_backlight_priv *priv = dev_get_priv(dev);
 	int ret;
@@ -66,7 +66,7 @@ U_BOOT_DRIVER(gpio_backlight) = {
 	.id	= UCLASS_PANEL_BACKLIGHT,
 	.of_match = gpio_backlight_ids,
 	.ops	= &gpio_backlight_ops,
-	.ofdata_to_platdata	= gpio_backlight_ofdata_to_platdata,
+	.of_to_plat	= gpio_backlight_of_to_plat,
 	.probe		= gpio_backlight_probe,
 	.priv_auto	= sizeof(struct gpio_backlight_priv),
 };
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index 69bf2ee317f..8e5c6cf866a 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -706,7 +706,7 @@ static int broadwell_igd_probe(struct udevice *dev)
 	return 0;
 }
 
-static int broadwell_igd_ofdata_to_platdata(struct udevice *dev)
+static int broadwell_igd_of_to_plat(struct udevice *dev)
 {
 	struct broadwell_igd_plat *plat = dev_get_plat(dev);
 	struct broadwell_igd_priv *priv = dev_get_priv(dev);
@@ -778,7 +778,7 @@ U_BOOT_DRIVER(broadwell_igd) = {
 	.id	= UCLASS_VIDEO,
 	.of_match = broadwell_igd_ids,
 	.ops	= &broadwell_igd_ops,
-	.ofdata_to_platdata = broadwell_igd_ofdata_to_platdata,
+	.of_to_plat = broadwell_igd_of_to_plat,
 	.bind	= broadwell_igd_bind,
 	.probe	= broadwell_igd_probe,
 	.priv_auto	= sizeof(struct broadwell_igd_priv),
diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c
index f18189a1de0..63b5b8e61a2 100644
--- a/drivers/video/exynos/exynos_dp.c
+++ b/drivers/video/exynos/exynos_dp.c
@@ -877,7 +877,7 @@ static unsigned int exynos_dp_config_video(struct exynos_dp *regs,
 	return ret;
 }
 
-static int exynos_dp_ofdata_to_platdata(struct udevice *dev)
+static int exynos_dp_of_to_plat(struct udevice *dev)
 {
 	struct exynos_dp_priv *priv = dev_get_priv(dev);
 	const void *blob = gd->fdt_blob;
@@ -1080,6 +1080,6 @@ U_BOOT_DRIVER(exynos_dp) = {
 	.id	= UCLASS_DISPLAY,
 	.of_match = exynos_dp_ids,
 	.ops	= &exynos_dp_ops,
-	.ofdata_to_platdata	= exynos_dp_ofdata_to_platdata,
+	.of_to_plat	= exynos_dp_of_to_plat,
 	.priv_auto	= sizeof(struct exynos_dp_priv),
 };
diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c
index 64bc8478845..cd7767fb6e7 100644
--- a/drivers/video/exynos/exynos_fb.c
+++ b/drivers/video/exynos/exynos_fb.c
@@ -479,7 +479,7 @@ unsigned long exynos_fimd_calc_fbsize(struct exynos_fb_priv *priv)
 	return priv->vl_col * priv->vl_row * (VNBITS(priv->vl_bpix) / 8);
 }
 
-int exynos_fb_ofdata_to_platdata(struct udevice *dev)
+int exynos_fb_of_to_plat(struct udevice *dev)
 {
 	struct exynos_fb_priv *priv = dev_get_priv(dev);
 	unsigned int node = dev_of_offset(dev);
@@ -715,6 +715,6 @@ U_BOOT_DRIVER(exynos_fb) = {
 	.ops	= &exynos_fb_ops,
 	.bind	= exynos_fb_bind,
 	.probe	= exynos_fb_probe,
-	.ofdata_to_platdata	= exynos_fb_ofdata_to_platdata,
+	.of_to_plat	= exynos_fb_of_to_plat,
 	.priv_auto	= sizeof(struct exynos_fb_priv),
 };
diff --git a/drivers/video/lg4573.c b/drivers/video/lg4573.c
index 73a1add0853..abf40bddfbe 100644
--- a/drivers/video/lg4573.c
+++ b/drivers/video/lg4573.c
@@ -294,7 +294,7 @@ static const struct dm_display_ops lg4573_lcd_ops = {
 	.enable = lg4573_lcd_enable,
 };
 
-static int lg4573_ofdata_to_platdata(struct udevice *dev)
+static int lg4573_of_to_plat(struct udevice *dev)
 {
 	struct lg4573_lcd_priv *priv = dev_get_priv(dev);
 	int ret;
@@ -323,7 +323,7 @@ U_BOOT_DRIVER(lg4573_lcd) = {
 	.name   = "lg4573",
 	.id     = UCLASS_DISPLAY,
 	.ops    = &lg4573_lcd_ops,
-	.ofdata_to_platdata	= lg4573_ofdata_to_platdata,
+	.of_to_plat	= lg4573_of_to_plat,
 	.of_match = lg4573_ids,
 	.bind   = lg4573_bind,
 	.probe  = lg4573_probe,
diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c
index 39c1c337c65..95738e34bf6 100644
--- a/drivers/video/orisetech_otm8009a.c
+++ b/drivers/video/orisetech_otm8009a.c
@@ -295,7 +295,7 @@ static int otm8009a_panel_get_display_timing(struct udevice *dev,
 	return 0;
 }
 
-static int otm8009a_panel_ofdata_to_platdata(struct udevice *dev)
+static int otm8009a_panel_of_to_plat(struct udevice *dev)
 {
 	struct otm8009a_panel_priv *priv = dev_get_priv(dev);
 	int ret;
@@ -364,7 +364,7 @@ U_BOOT_DRIVER(otm8009a_panel) = {
 	.id			  = UCLASS_PANEL,
 	.of_match		  = otm8009a_panel_ids,
 	.ops			  = &otm8009a_panel_ops,
-	.ofdata_to_platdata	  = otm8009a_panel_ofdata_to_platdata,
+	.of_to_plat	  = otm8009a_panel_of_to_plat,
 	.probe			  = otm8009a_panel_probe,
 	.plat_auto	= sizeof(struct mipi_dsi_panel_plat),
 	.priv_auto	= sizeof(struct otm8009a_panel_priv),
diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c
index d1407977aa0..9e32bc47cff 100644
--- a/drivers/video/pwm_backlight.c
+++ b/drivers/video/pwm_backlight.c
@@ -182,7 +182,7 @@ static int pwm_backlight_set_brightness(struct udevice *dev, int percent)
 	return 0;
 }
 
-static int pwm_backlight_ofdata_to_platdata(struct udevice *dev)
+static int pwm_backlight_of_to_plat(struct udevice *dev)
 {
 	struct pwm_backlight_priv *priv = dev_get_priv(dev);
 	struct ofnode_phandle_args args;
@@ -263,7 +263,7 @@ U_BOOT_DRIVER(pwm_backlight) = {
 	.id	= UCLASS_PANEL_BACKLIGHT,
 	.of_match = pwm_backlight_ids,
 	.ops	= &pwm_backlight_ops,
-	.ofdata_to_platdata	= pwm_backlight_ofdata_to_platdata,
+	.of_to_plat	= pwm_backlight_of_to_plat,
 	.probe		= pwm_backlight_probe,
 	.priv_auto	= sizeof(struct pwm_backlight_priv),
 };
diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c
index a370cd99e09..373668d28bf 100644
--- a/drivers/video/raydium-rm68200.c
+++ b/drivers/video/raydium-rm68200.c
@@ -261,7 +261,7 @@ static int rm68200_panel_get_display_timing(struct udevice *dev,
 	return 0;
 }
 
-static int rm68200_panel_ofdata_to_platdata(struct udevice *dev)
+static int rm68200_panel_of_to_plat(struct udevice *dev)
 {
 	struct rm68200_panel_priv *priv = dev_get_priv(dev);
 	int ret;
@@ -336,7 +336,7 @@ U_BOOT_DRIVER(rm68200_panel) = {
 	.id			  = UCLASS_PANEL,
 	.of_match		  = rm68200_panel_ids,
 	.ops			  = &rm68200_panel_ops,
-	.ofdata_to_platdata	  = rm68200_panel_ofdata_to_platdata,
+	.of_to_plat	  = rm68200_panel_of_to_plat,
 	.probe			  = rm68200_panel_probe,
 	.plat_auto	= sizeof(struct mipi_dsi_panel_plat),
 	.priv_auto	= sizeof(struct rm68200_panel_priv),
diff --git a/drivers/video/rockchip/rk3288_hdmi.c b/drivers/video/rockchip/rk3288_hdmi.c
index a25b40c37f1..327ae787125 100644
--- a/drivers/video/rockchip/rk3288_hdmi.c
+++ b/drivers/video/rockchip/rk3288_hdmi.c
@@ -38,7 +38,7 @@ static int rk3288_hdmi_enable(struct udevice *dev, int panel_bpp,
 	return dw_hdmi_enable(&priv->hdmi, edid);
 }
 
-static int rk3288_hdmi_ofdata_to_platdata(struct udevice *dev)
+static int rk3288_hdmi_of_to_plat(struct udevice *dev)
 {
 	struct rk_hdmi_priv *priv = dev_get_priv(dev);
 	struct dw_hdmi *hdmi = &priv->hdmi;
@@ -53,7 +53,7 @@ static int rk3288_hdmi_ofdata_to_platdata(struct udevice *dev)
 	hdmi->i2c_clk_high = 0x0d;
 	hdmi->i2c_clk_low = 0x0d;
 
-	return rk_hdmi_ofdata_to_platdata(dev);
+	return rk_hdmi_of_to_plat(dev);
 }
 
 static int rk3288_clk_config(struct udevice *dev)
@@ -111,7 +111,7 @@ U_BOOT_DRIVER(rk3288_hdmi_rockchip) = {
 	.id = UCLASS_DISPLAY,
 	.of_match = rk3288_hdmi_ids,
 	.ops = &rk3288_hdmi_ops,
-	.ofdata_to_platdata = rk3288_hdmi_ofdata_to_platdata,
+	.of_to_plat = rk3288_hdmi_of_to_plat,
 	.probe = rk3288_hdmi_probe,
 	.priv_auto	= sizeof(struct rk_hdmi_priv),
 };
diff --git a/drivers/video/rockchip/rk3288_mipi.c b/drivers/video/rockchip/rk3288_mipi.c
index f8b83a99dcd..7e48dd83466 100644
--- a/drivers/video/rockchip/rk3288_mipi.c
+++ b/drivers/video/rockchip/rk3288_mipi.c
@@ -129,7 +129,7 @@ static int rk_mipi_enable(struct udevice *dev, int panel_bpp,
 	return 0;
 }
 
-static int rk_mipi_ofdata_to_platdata(struct udevice *dev)
+static int rk_mipi_of_to_plat(struct udevice *dev)
 {
 	struct rk_mipi_priv *priv = dev_get_priv(dev);
 
@@ -182,7 +182,7 @@ U_BOOT_DRIVER(rk_mipi_dsi) = {
 	.name	= "rk_mipi_dsi",
 	.id	= UCLASS_DISPLAY,
 	.of_match = rk_mipi_dsi_ids,
-	.ofdata_to_platdata = rk_mipi_ofdata_to_platdata,
+	.of_to_plat = rk_mipi_of_to_plat,
 	.probe	= rk_mipi_probe,
 	.ops	= &rk_mipi_dsi_ops,
 	.priv_auto	  = sizeof(struct rk_mipi_priv),
diff --git a/drivers/video/rockchip/rk3399_hdmi.c b/drivers/video/rockchip/rk3399_hdmi.c
index 39f0c323f3a..3041360c6ed 100644
--- a/drivers/video/rockchip/rk3399_hdmi.c
+++ b/drivers/video/rockchip/rk3399_hdmi.c
@@ -34,7 +34,7 @@ static int rk3399_hdmi_enable(struct udevice *dev, int panel_bpp,
 	return dw_hdmi_enable(&priv->hdmi, edid);
 }
 
-static int rk3399_hdmi_ofdata_to_platdata(struct udevice *dev)
+static int rk3399_hdmi_of_to_plat(struct udevice *dev)
 {
 	struct rk_hdmi_priv *priv = dev_get_priv(dev);
 	struct dw_hdmi *hdmi = &priv->hdmi;
@@ -42,7 +42,7 @@ static int rk3399_hdmi_ofdata_to_platdata(struct udevice *dev)
 	hdmi->i2c_clk_high = 0x7a;
 	hdmi->i2c_clk_low = 0x8d;
 
-	return rk_hdmi_ofdata_to_platdata(dev);
+	return rk_hdmi_of_to_plat(dev);
 }
 
 static const char * const rk3399_regulator_names[] = {
@@ -74,7 +74,7 @@ U_BOOT_DRIVER(rk3399_hdmi_rockchip) = {
 	.id = UCLASS_DISPLAY,
 	.of_match = rk3399_hdmi_ids,
 	.ops = &rk3399_hdmi_ops,
-	.ofdata_to_platdata = rk3399_hdmi_ofdata_to_platdata,
+	.of_to_plat = rk3399_hdmi_of_to_plat,
 	.probe = rk3399_hdmi_probe,
 	.priv_auto	= sizeof(struct rk_hdmi_priv),
 };
diff --git a/drivers/video/rockchip/rk3399_mipi.c b/drivers/video/rockchip/rk3399_mipi.c
index 3b8ac3f730e..91733504831 100644
--- a/drivers/video/rockchip/rk3399_mipi.c
+++ b/drivers/video/rockchip/rk3399_mipi.c
@@ -121,7 +121,7 @@ static int rk_display_enable(struct udevice *dev, int panel_bpp,
 	return 0;
 }
 
-static int rk_mipi_ofdata_to_platdata(struct udevice *dev)
+static int rk_mipi_of_to_plat(struct udevice *dev)
 {
 	struct rk_mipi_priv *priv = dev_get_priv(dev);
 
@@ -173,7 +173,7 @@ U_BOOT_DRIVER(rk_mipi_dsi) = {
 	.name	= "rk_mipi_dsi",
 	.id	= UCLASS_DISPLAY,
 	.of_match = rk_mipi_dsi_ids,
-	.ofdata_to_platdata = rk_mipi_ofdata_to_platdata,
+	.of_to_plat = rk_mipi_of_to_plat,
 	.probe	= rk_mipi_probe,
 	.ops	= &rk_mipi_dsi_ops,
 	.priv_auto	  = sizeof(struct rk_mipi_priv),
diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
index 30fe8cee3c3..0be60e169e3 100644
--- a/drivers/video/rockchip/rk_edp.c
+++ b/drivers/video/rockchip/rk_edp.c
@@ -1001,7 +1001,7 @@ done:
 	return edid_size;
 }
 
-static int rk_edp_ofdata_to_platdata(struct udevice *dev)
+static int rk_edp_of_to_plat(struct udevice *dev)
 {
 	struct rk_edp_priv *priv = dev_get_priv(dev);
 
@@ -1099,7 +1099,7 @@ U_BOOT_DRIVER(dp_rockchip) = {
 	.id	= UCLASS_DISPLAY,
 	.of_match = rockchip_dp_ids,
 	.ops	= &dp_rockchip_ops,
-	.ofdata_to_platdata	= rk_edp_ofdata_to_platdata,
+	.of_to_plat	= rk_edp_of_to_plat,
 	.probe	= rk_edp_probe,
 	.remove	= rk_edp_remove,
 	.priv_auto	= sizeof(struct rk_edp_priv),
diff --git a/drivers/video/rockchip/rk_hdmi.c b/drivers/video/rockchip/rk_hdmi.c
index f27cdf8ed4b..8dcd4d59645 100644
--- a/drivers/video/rockchip/rk_hdmi.c
+++ b/drivers/video/rockchip/rk_hdmi.c
@@ -78,7 +78,7 @@ int rk_hdmi_read_edid(struct udevice *dev, u8 *buf, int buf_size)
 	return dw_hdmi_read_edid(&priv->hdmi, buf, buf_size);
 }
 
-int rk_hdmi_ofdata_to_platdata(struct udevice *dev)
+int rk_hdmi_of_to_plat(struct udevice *dev)
 {
 	struct rk_hdmi_priv *priv = dev_get_priv(dev);
 	struct dw_hdmi *hdmi = &priv->hdmi;
diff --git a/drivers/video/rockchip/rk_hdmi.h b/drivers/video/rockchip/rk_hdmi.h
index 5767ef14437..859a0b9ff3f 100644
--- a/drivers/video/rockchip/rk_hdmi.h
+++ b/drivers/video/rockchip/rk_hdmi.h
@@ -52,12 +52,12 @@ int rk_hdmi_read_edid(struct udevice *dev, u8 *buf, int buf_size);
 void rk_hdmi_probe_regulators(struct udevice *dev,
 			      const char * const *names, int cnt);
 /**
- * rk_hdmi_ofdata_to_platdata() - common ofdata_to_platdata implementation
+ * rk_hdmi_of_to_plat() - common of_to_plat implementation
  *
  * @dev:	device
  * @return 0 if OK, -ve if something went wrong
  */
-int rk_hdmi_ofdata_to_platdata(struct udevice *dev);
+int rk_hdmi_of_to_plat(struct udevice *dev);
 
 /**
  * rk_hdmi_probe() - common probe implementation
diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c
index 74a1d3071dd..03c8257a357 100644
--- a/drivers/video/rockchip/rk_lvds.c
+++ b/drivers/video/rockchip/rk_lvds.c
@@ -170,7 +170,7 @@ int rk_lvds_read_timing(struct udevice *dev, struct display_timing *timing)
 	return 0;
 }
 
-static int rk_lvds_ofdata_to_platdata(struct udevice *dev)
+static int rk_lvds_of_to_plat(struct udevice *dev)
 {
 	struct rk_lvds_priv *priv = dev_get_priv(dev);
 	int ret;
@@ -245,7 +245,7 @@ U_BOOT_DRIVER(lvds_rockchip) = {
 	.id	= UCLASS_DISPLAY,
 	.of_match = rockchip_lvds_ids,
 	.ops	= &lvds_rockchip_ops,
-	.ofdata_to_platdata	= rk_lvds_ofdata_to_platdata,
+	.of_to_plat	= rk_lvds_of_to_plat,
 	.probe	= rk_lvds_probe,
 	.priv_auto	= sizeof(struct rk_lvds_priv),
 };
diff --git a/drivers/video/simple_panel.c b/drivers/video/simple_panel.c
index 3be4f25d8b3..59e17f8f10f 100644
--- a/drivers/video/simple_panel.c
+++ b/drivers/video/simple_panel.c
@@ -48,7 +48,7 @@ static int simple_panel_set_backlight(struct udevice *dev, int percent)
 	return 0;
 }
 
-static int simple_panel_ofdata_to_platdata(struct udevice *dev)
+static int simple_panel_of_to_plat(struct udevice *dev)
 {
 	struct simple_panel_priv *priv = dev_get_priv(dev);
 	int ret;
@@ -116,7 +116,7 @@ U_BOOT_DRIVER(simple_panel) = {
 	.id	= UCLASS_PANEL,
 	.of_match = simple_panel_ids,
 	.ops	= &simple_panel_ops,
-	.ofdata_to_platdata	= simple_panel_ofdata_to_platdata,
+	.of_to_plat	= simple_panel_of_to_plat,
 	.probe		= simple_panel_probe,
 	.priv_auto	= sizeof(struct simple_panel_priv),
 };
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index 10b834ca76d..d185096db01 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -336,7 +336,7 @@ static int tegra_lcd_probe(struct udevice *dev)
 	return 0;
 }
 
-static int tegra_lcd_ofdata_to_platdata(struct udevice *dev)
+static int tegra_lcd_of_to_plat(struct udevice *dev)
 {
 	struct tegra_lcd_priv *priv = dev_get_priv(dev);
 	const void *blob = gd->fdt_blob;
@@ -423,6 +423,6 @@ U_BOOT_DRIVER(tegra_lcd) = {
 	.ops	= &tegra_lcd_ops,
 	.bind	= tegra_lcd_bind,
 	.probe	= tegra_lcd_probe,
-	.ofdata_to_platdata	= tegra_lcd_ofdata_to_platdata,
+	.of_to_plat	= tegra_lcd_of_to_plat,
 	.priv_auto	= sizeof(struct tegra_lcd_priv),
 };
diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c
index d9599ee950a..8f5116fe7c8 100644
--- a/drivers/video/tegra124/dp.c
+++ b/drivers/video/tegra124/dp.c
@@ -1566,7 +1566,7 @@ error_enable:
 	return 0;
 }
 
-static int tegra_dp_ofdata_to_platdata(struct udevice *dev)
+static int tegra_dp_of_to_plat(struct udevice *dev)
 {
 	struct tegra_dp_plat *plat = dev_get_plat(dev);
 
@@ -1616,7 +1616,7 @@ U_BOOT_DRIVER(dp_tegra) = {
 	.name	= "dpaux_tegra",
 	.id	= UCLASS_DISPLAY,
 	.of_match = tegra_dp_ids,
-	.ofdata_to_platdata = tegra_dp_ofdata_to_platdata,
+	.of_to_plat = tegra_dp_of_to_plat,
 	.probe	= dp_tegra_probe,
 	.ops	= &dp_tegra_ops,
 	.priv_auto	= sizeof(struct tegra_dp_priv),
diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c
index 83f3aad92cb..95976ee5735 100644
--- a/drivers/video/tegra124/sor.c
+++ b/drivers/video/tegra124/sor.c
@@ -1042,7 +1042,7 @@ static int tegra_sor_set_backlight(struct udevice *dev, int percent)
 	return 0;
 }
 
-static int tegra_sor_ofdata_to_platdata(struct udevice *dev)
+static int tegra_sor_of_to_plat(struct udevice *dev)
 {
 	struct tegra_dc_sor_data *priv = dev_get_priv(dev);
 	int ret;
@@ -1077,7 +1077,7 @@ U_BOOT_DRIVER(sor_tegra) = {
 	.name	= "sor_tegra",
 	.id	= UCLASS_VIDEO_BRIDGE,
 	.of_match = tegra_sor_ids,
-	.ofdata_to_platdata = tegra_sor_ofdata_to_platdata,
+	.of_to_plat = tegra_sor_of_to_plat,
 	.ops	= &tegra_sor_ops,
 	.priv_auto	= sizeof(struct tegra_dc_sor_data),
 };
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index 90ee1d4271e..78c15c821b4 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -334,7 +334,7 @@ static int virtio_mmio_notify(struct udevice *udev, struct virtqueue *vq)
 	return 0;
 }
 
-static int virtio_mmio_ofdata_to_platdata(struct udevice *udev)
+static int virtio_mmio_of_to_plat(struct udevice *udev)
 {
 	struct virtio_mmio_priv *priv = dev_get_priv(udev);
 
@@ -411,6 +411,6 @@ U_BOOT_DRIVER(virtio_mmio) = {
 	.of_match = virtio_mmio_ids,
 	.ops	= &virtio_mmio_ops,
 	.probe	= virtio_mmio_probe,
-	.ofdata_to_platdata = virtio_mmio_ofdata_to_platdata,
+	.of_to_plat = virtio_mmio_of_to_plat,
 	.priv_auto	= sizeof(struct virtio_mmio_priv),
 };
diff --git a/drivers/w1/mxc_w1.c b/drivers/w1/mxc_w1.c
index 99fb9603e69..3637febc0c5 100644
--- a/drivers/w1/mxc_w1.c
+++ b/drivers/w1/mxc_w1.c
@@ -166,7 +166,7 @@ static u8 mxc_w1_triplet(struct udevice *dev, bool bdir)
 	return retval;
 }
 
-static int mxc_w1_ofdata_to_platdata(struct udevice *dev)
+static int mxc_w1_of_to_plat(struct udevice *dev)
 {
 	struct mxc_w1_pdata *pdata = dev_get_plat(dev);
 	fdt_addr_t addr;
@@ -228,7 +228,7 @@ U_BOOT_DRIVER(mxc_w1_drv) = {
 	.id				= UCLASS_W1,
 	.name				= "mxc_w1_drv",
 	.of_match			= mxc_w1_id,
-	.ofdata_to_platdata		= mxc_w1_ofdata_to_platdata,
+	.of_to_plat		= mxc_w1_of_to_plat,
 	.ops				= &mxc_w1_ops,
 	.plat_auto	= sizeof(struct mxc_w1_pdata),
 	.probe				= mxc_w1_probe,
diff --git a/drivers/w1/w1-gpio.c b/drivers/w1/w1-gpio.c
index fe4ebe21a57..3b0ead6f6dc 100644
--- a/drivers/w1/w1-gpio.c
+++ b/drivers/w1/w1-gpio.c
@@ -151,7 +151,7 @@ static const struct w1_ops w1_gpio_ops = {
 	.write_byte	= w1_gpio_write_byte,
 };
 
-static int w1_gpio_ofdata_to_platdata(struct udevice *dev)
+static int w1_gpio_of_to_plat(struct udevice *dev)
 {
 	struct w1_gpio_pdata *pdata = dev_get_plat(dev);
 	int ret;
@@ -172,7 +172,7 @@ U_BOOT_DRIVER(w1_gpio_drv) = {
 	.id				= UCLASS_W1,
 	.name				= "w1_gpio_drv",
 	.of_match			= w1_gpio_id,
-	.ofdata_to_platdata		= w1_gpio_ofdata_to_platdata,
+	.of_to_plat		= w1_gpio_of_to_plat,
 	.ops				= &w1_gpio_ops,
 	.plat_auto	= sizeof(struct w1_gpio_pdata),
 };
diff --git a/drivers/watchdog/ast_wdt.c b/drivers/watchdog/ast_wdt.c
index 9e2f484f4a2..f7b5a1adc10 100644
--- a/drivers/watchdog/ast_wdt.c
+++ b/drivers/watchdog/ast_wdt.c
@@ -86,7 +86,7 @@ static int ast_wdt_expire_now(struct udevice *dev, ulong flags)
 	return ast_wdt_stop(dev);
 }
 
-static int ast_wdt_ofdata_to_platdata(struct udevice *dev)
+static int ast_wdt_of_to_plat(struct udevice *dev)
 {
 	struct ast_wdt_priv *priv = dev_get_priv(dev);
 
@@ -125,6 +125,6 @@ U_BOOT_DRIVER(ast_wdt) = {
 	.of_match = ast_wdt_ids,
 	.probe = ast_wdt_probe,
 	.priv_auto	= sizeof(struct ast_wdt_priv),
-	.ofdata_to_platdata = ast_wdt_ofdata_to_platdata,
+	.of_to_plat = ast_wdt_of_to_plat,
 	.ops = &ast_wdt_ops,
 };
diff --git a/drivers/watchdog/cdns_wdt.c b/drivers/watchdog/cdns_wdt.c
index 44a9769c5df..966d010e40d 100644
--- a/drivers/watchdog/cdns_wdt.c
+++ b/drivers/watchdog/cdns_wdt.c
@@ -228,7 +228,7 @@ static int cdns_wdt_probe(struct udevice *dev)
 	return 0;
 }
 
-static int cdns_wdt_ofdata_to_platdata(struct udevice *dev)
+static int cdns_wdt_of_to_plat(struct udevice *dev)
 {
 	struct cdns_wdt_priv *priv = dev_get_priv(dev);
 
@@ -261,6 +261,6 @@ U_BOOT_DRIVER(cdns_wdt) = {
 	.of_match = cdns_wdt_ids,
 	.probe = cdns_wdt_probe,
 	.priv_auto	= sizeof(struct cdns_wdt_priv),
-	.ofdata_to_platdata = cdns_wdt_ofdata_to_platdata,
+	.of_to_plat = cdns_wdt_of_to_plat,
 	.ops = &cdns_wdt_ops,
 };
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 171d81aec59..167af904dc2 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -133,7 +133,7 @@ static inline bool save_reg_from_ofdata(struct udevice *dev, int index,
 	return true;
 }
 
-static int orion_wdt_ofdata_to_platdata(struct udevice *dev)
+static int orion_wdt_of_to_plat(struct udevice *dev)
 {
 	struct orion_wdt_priv *priv = dev_get_priv(dev);
 
@@ -187,6 +187,6 @@ U_BOOT_DRIVER(orion_wdt) = {
 	.of_match = orion_wdt_ids,
 	.probe = orion_wdt_probe,
 	.priv_auto	= sizeof(struct orion_wdt_priv),
-	.ofdata_to_platdata = orion_wdt_ofdata_to_platdata,
+	.of_to_plat = orion_wdt_of_to_plat,
 	.ops = &orion_wdt_ops,
 };
diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
index 66553e5591b..df68adbd6a1 100644
--- a/drivers/watchdog/sbsa_gwdt.c
+++ b/drivers/watchdog/sbsa_gwdt.c
@@ -93,7 +93,7 @@ static int sbsa_gwdt_probe(struct udevice *dev)
 	return 0;
 }
 
-static int sbsa_gwdt_ofdata_to_platdata(struct udevice *dev)
+static int sbsa_gwdt_of_to_plat(struct udevice *dev)
 {
 	struct sbsa_gwdt_priv *priv = dev_get_priv(dev);
 
@@ -126,6 +126,6 @@ U_BOOT_DRIVER(sbsa_gwdt) = {
 	.of_match = sbsa_gwdt_ids,
 	.probe = sbsa_gwdt_probe,
 	.priv_auto	= sizeof(struct sbsa_gwdt_priv),
-	.ofdata_to_platdata = sbsa_gwdt_ofdata_to_platdata,
+	.of_to_plat = sbsa_gwdt_of_to_plat,
 	.ops = &sbsa_gwdt_ops,
 };
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index df57917f15a..291aad75701 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -110,7 +110,7 @@ static int sp805_wdt_probe(struct udevice *dev)
 	return 0;
 }
 
-static int sp805_wdt_ofdata_to_platdata(struct udevice *dev)
+static int sp805_wdt_of_to_plat(struct udevice *dev)
 {
 	struct sp805_wdt_priv *priv = dev_get_priv(dev);
 	struct clk clk;
@@ -143,6 +143,6 @@ U_BOOT_DRIVER(sp805_wdt) = {
 	.of_match = sp805_wdt_ids,
 	.probe = sp805_wdt_probe,
 	.priv_auto	= sizeof(struct sp805_wdt_priv),
-	.ofdata_to_platdata = sp805_wdt_ofdata_to_platdata,
+	.of_to_plat = sp805_wdt_of_to_plat,
 	.ops = &sp805_wdt_ops,
 };
diff --git a/drivers/watchdog/xilinx_tb_wdt.c b/drivers/watchdog/xilinx_tb_wdt.c
index ce094436745..b7b10dd11f6 100644
--- a/drivers/watchdog/xilinx_tb_wdt.c
+++ b/drivers/watchdog/xilinx_tb_wdt.c
@@ -90,7 +90,7 @@ static int xlnx_wdt_probe(struct udevice *dev)
 	return 0;
 }
 
-static int xlnx_wdt_ofdata_to_platdata(struct udevice *dev)
+static int xlnx_wdt_of_to_plat(struct udevice *dev)
 {
 	struct xlnx_wdt_platdata *plat = dev_get_plat(dev);
 
@@ -124,6 +124,6 @@ U_BOOT_DRIVER(xlnx_wdt) = {
 	.of_match = xlnx_wdt_ids,
 	.probe = xlnx_wdt_probe,
 	.plat_auto	= sizeof(struct xlnx_wdt_platdata),
-	.ofdata_to_platdata = xlnx_wdt_ofdata_to_platdata,
+	.of_to_plat = xlnx_wdt_of_to_plat,
 	.ops = &xlnx_wdt_ops,
 };
diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c
index 064caa0e87f..8345b9086e8 100644
--- a/drivers/watchdog/xilinx_wwdt.c
+++ b/drivers/watchdog/xilinx_wwdt.c
@@ -145,7 +145,7 @@ static int xlnx_wwdt_probe(struct udevice *dev)
 	return ret;
 }
 
-static int xlnx_wwdt_ofdata_to_platdata(struct udevice *dev)
+static int xlnx_wwdt_of_to_plat(struct udevice *dev)
 {
 	struct xlnx_wwdt_platdata *plat = dev_get_plat(dev);
 
@@ -174,6 +174,6 @@ U_BOOT_DRIVER(xlnx_wwdt) = {
 	.probe = xlnx_wwdt_probe,
 	.priv_auto	= sizeof(struct xlnx_wwdt_priv),
 	.plat_auto	= sizeof(struct xlnx_wwdt_platdata),
-	.ofdata_to_platdata = xlnx_wwdt_ofdata_to_platdata,
+	.of_to_plat = xlnx_wwdt_of_to_plat,
 	.ops = &xlnx_wwdt_ops,
 };
diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h
index 2e9c1d5ef9c..af3b6b2b054 100644
--- a/include/dm/device-internal.h
+++ b/include/dm/device-internal.h
@@ -89,7 +89,7 @@ int device_bind_by_name(struct udevice *parent, bool pre_reloc_only,
 int device_reparent(struct udevice *dev, struct udevice *new_parent);
 
 /**
- * device_ofdata_to_platdata() - Read platform data for a device
+ * device_of_to_plat() - Read platform data for a device
  *
  * Read platform data for a device (typically from the device tree) so that
  * the information needed to probe the device is present.
@@ -102,7 +102,7 @@ int device_reparent(struct udevice *dev, struct udevice *new_parent);
  * @dev: Pointer to device to process
  * @return 0 if OK, -ve on error
  */
-int device_ofdata_to_platdata(struct udevice *dev);
+int device_of_to_plat(struct udevice *dev);
 
 /**
  * device_probe() - Probe a device, activating it
diff --git a/include/dm/device.h b/include/dm/device.h
index a9af9326498..30fc98dc345 100644
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -107,7 +107,7 @@ enum {
  * a U_BOOT_DEVICE() macro (in which case plat is non-NULL) or a node
  * in the device tree (in which case of_offset is >= 0). In the latter case
  * we translate the device tree information into plat in a function
- * implemented by the driver ofdata_to_platdata method (called just before the
+ * implemented by the driver of_to_plat method (called just before the
  * probe method if the device has a device tree node.
  *
  * All three of plat, priv and uclass_priv can be allocated by the
@@ -225,7 +225,7 @@ struct udevice_id {
  * @probe: Called to probe a device, i.e. activate it
  * @remove: Called to remove a device, i.e. de-activate it
  * @unbind: Called to unbind a device from its driver
- * @ofdata_to_platdata: Called before probe to decode device tree data
+ * @of_to_plat: Called before probe to decode device tree data
  * @child_post_bind: Called after a new child has been bound
  * @child_pre_probe: Called before a child device is probed. The device has
  * memory allocated but it has not yet been probed.
@@ -260,7 +260,7 @@ struct driver {
 	int (*probe)(struct udevice *dev);
 	int (*remove)(struct udevice *dev);
 	int (*unbind)(struct udevice *dev);
-	int (*ofdata_to_platdata)(struct udevice *dev);
+	int (*of_to_plat)(struct udevice *dev);
 	int (*child_post_bind)(struct udevice *dev);
 	int (*child_pre_probe)(struct udevice *dev);
 	int (*child_post_remove)(struct udevice *dev);
@@ -622,7 +622,7 @@ int device_find_child_by_name(const struct udevice *parent, const char *name,
 /**
  * device_first_child_ofdata_err() - Find the first child and reads its plat
  *
- * The ofdata_to_platdata() method is called on the child before it is returned,
+ * The of_to_plat() method is called on the child before it is returned,
  * but the child is not probed.
  *
  * @parent: Parent to check
@@ -635,7 +635,7 @@ int device_first_child_ofdata_err(struct udevice *parent,
 /*
  * device_next_child_ofdata_err() - Find the next child and read its plat
  *
- * The ofdata_to_platdata() method is called on the child before it is returned,
+ * The of_to_plat() method is called on the child before it is returned,
  * but the child is not probed.
  *
  * @devp: On entry, points to the previous child; on exit returns the child that
@@ -796,19 +796,19 @@ static inline bool device_is_on_pci_bus(const struct udevice *dev)
 	list_for_each_entry(pos, &parent->child_head, sibling_node)
 
 /**
- * device_foreach_child_ofdata_to_platdata() - iterate through children
+ * device_foreach_child_of_to_plat() - iterate through children
  *
  * This stops when it gets an error, with @pos set to the device that failed to
  * read ofdata.
 
  * This creates a for() loop which works through the available children of
  * a device in order from start to end. Device ofdata is read by calling
- * device_ofdata_to_platdata() on each one. The devices are not probed.
+ * device_of_to_plat() on each one. The devices are not probed.
  *
  * @pos: struct udevice * for the current device
  * @parent: parent device to scan
  */
-#define device_foreach_child_ofdata_to_platdata(pos, parent)	\
+#define device_foreach_child_of_to_plat(pos, parent)	\
 	for (int _ret = device_first_child_ofdata_err(parent, &dev); !_ret; \
 	     _ret = device_next_child_ofdata_err(&dev))
 
diff --git a/include/dm/platform_data/spi_pl022.h b/include/dm/platform_data/spi_pl022.h
index 63a58ee4535..c5aa3212915 100644
--- a/include/dm/platform_data/spi_pl022.h
+++ b/include/dm/platform_data/spi_pl022.h
@@ -4,7 +4,7 @@
  * Quentin Schulz, Bootlin, quentin.schulz@bootlin.com
  *
  * Structure for use with U_BOOT_DEVICE for pl022 SPI devices or to use
- * in ofdata_to_platdata.
+ * in of_to_plat.
  */
 
 #ifndef __spi_pl022_h
diff --git a/include/i2c.h b/include/i2c.h
index d0a390141b8..e45e33f5037 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -521,17 +521,17 @@ int i2c_get_chip_for_busnum(int busnum, int chip_addr, uint offset_len,
 			    struct udevice **devp);
 
 /**
- * i2c_chip_ofdata_to_platdata() - Decode standard I2C platform data
+ * i2c_chip_of_to_plat() - Decode standard I2C platform data
  *
  * This decodes the chip address from a device tree node and puts it into
  * its dm_i2c_chip structure. This should be called in your driver's
- * ofdata_to_platdata() method.
+ * of_to_plat() method.
  *
  * @blob:	Device tree blob
  * @node:	Node offset to read from
  * @spi:	Place to put the decoded information
  */
-int i2c_chip_ofdata_to_platdata(struct udevice *dev, struct dm_i2c_chip *chip);
+int i2c_chip_of_to_plat(struct udevice *dev, struct dm_i2c_chip *chip);
 
 /**
  * i2c_dump_msgs() - Dump a list of I2C messages
@@ -568,7 +568,7 @@ struct udevice *i2c_emul_get_device(struct udevice *emul);
 extern struct acpi_ops i2c_acpi_ops;
 
 /**
- * acpi_i2c_ofdata_to_platdata() - Read properties intended for ACPI
+ * acpi_i2c_of_to_plat() - Read properties intended for ACPI
  *
  * This reads the generic I2C properties from the device tree, so that these
  * can be used to create ACPI information for the device.
@@ -579,7 +579,7 @@ extern struct acpi_ops i2c_acpi_ops;
  * @dev: I2C device to process
  * @return 0 if OK, -EINVAL if acpi,hid is not present
  */
-int acpi_i2c_ofdata_to_platdata(struct udevice *dev);
+int acpi_i2c_of_to_plat(struct udevice *dev);
 
 #ifndef CONFIG_DM_I2C
 
diff --git a/include/ns16550.h b/include/ns16550.h
index 18c9077755b..08e933ffe79 100644
--- a/include/ns16550.h
+++ b/include/ns16550.h
@@ -241,7 +241,7 @@ void NS16550_reinit(NS16550_t com_port, int baud_divisor);
 int ns16550_calc_divisor(NS16550_t port, int clock, int baudrate);
 
 /**
- * ns16550_serial_ofdata_to_platdata() - convert DT to platform data
+ * ns16550_serial_of_to_plat() - convert DT to platform data
  *
  * Decode a device tree node for an ns16550 device. This includes the
  * register base address and register shift properties. The caller must set
@@ -250,7 +250,7 @@ int ns16550_calc_divisor(NS16550_t port, int clock, int baudrate);
  * @dev:	dev to decode platform data for
  * @return:	0 if OK, -EINVAL on error
  */
-int ns16550_serial_ofdata_to_platdata(struct udevice *dev);
+int ns16550_serial_of_to_plat(struct udevice *dev);
 
 /**
  * ns16550_serial_probe() - probe a serial port
diff --git a/include/spi.h b/include/spi.h
index 96be27690f7..8c131c96bed 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -601,7 +601,7 @@ int spi_chip_select(struct udevice *slave);
 int spi_find_chip_select(struct udevice *bus, int cs, struct udevice **devp);
 
 /**
- * spi_slave_ofdata_to_platdata() - decode standard SPI platform data
+ * spi_slave_of_to_plat() - decode standard SPI platform data
  *
  * This decodes the speed and mode for a slave from a device tree node
  *
@@ -609,8 +609,8 @@ int spi_find_chip_select(struct udevice *bus, int cs, struct udevice **devp);
  * @node:	Node offset to read from
  * @plat:	Place to put the decoded information
  */
-int spi_slave_ofdata_to_platdata(struct udevice *dev,
-				 struct dm_spi_slave_platdata *plat);
+int spi_slave_of_to_plat(struct udevice *dev,
+			 struct dm_spi_slave_platdata *plat);
 
 /**
  * spi_cs_info() - Check information on a chip select
diff --git a/test/dm/devres.c b/test/dm/devres.c
index 00edbd0e9c0..4f959d11da9 100644
--- a/test/dm/devres.c
+++ b/test/dm/devres.c
@@ -159,7 +159,7 @@ static int dm_test_devres_phase(struct unit_test_state *uts)
 	ut_asserteq(TEST_DEVRES_SIZE, stats.total_size);
 
 	/* Getting plat should add one allocation */
-	ut_assertok(device_ofdata_to_platdata(dev));
+	ut_assertok(device_of_to_plat(dev));
 	devres_get_stats(dev, &stats);
 	ut_asserteq(2, stats.allocs);
 	ut_asserteq(TEST_DEVRES_SIZE + TEST_DEVRES_SIZE3, stats.total_size);
diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
index f3299bb3a84..1f0248ac679 100644
--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@ -38,7 +38,7 @@ static const struct test_ops test_ops = {
 	.ping = testfdt_drv_ping,
 };
 
-static int testfdt_ofdata_to_platdata(struct udevice *dev)
+static int testfdt_of_to_plat(struct udevice *dev)
 {
 	struct dm_test_pdata *pdata = dev_get_plat(dev);
 
@@ -83,7 +83,7 @@ U_BOOT_DRIVER(testfdt_drv) = {
 	.name	= "testfdt_drv",
 	.of_match	= testfdt_ids,
 	.id	= UCLASS_TEST_FDT,
-	.ofdata_to_platdata = testfdt_ofdata_to_platdata,
+	.of_to_plat = testfdt_of_to_plat,
 	.probe	= testfdt_drv_probe,
 	.ops	= &test_ops,
 	.priv_auto	= sizeof(struct dm_test_priv),
@@ -101,7 +101,7 @@ U_BOOT_DRIVER(testfdt1_drv) = {
 	.name	= "testfdt1_drv",
 	.of_match	= testfdt1_ids,
 	.id	= UCLASS_TEST_FDT,
-	.ofdata_to_platdata = testfdt_ofdata_to_platdata,
+	.of_to_plat = testfdt_of_to_plat,
 	.probe	= testfdt_drv_probe,
 	.ops	= &test_ops,
 	.priv_auto	= sizeof(struct dm_test_priv),
@@ -174,7 +174,7 @@ static int testdevres_drv_bind(struct udevice *dev)
 	return 0;
 }
 
-static int testdevres_drv_ofdata_to_platdata(struct udevice *dev)
+static int testdevres_drv_of_to_plat(struct udevice *dev)
 {
 	struct dm_testdevres_priv *priv = dev_get_priv(dev);
 
@@ -202,7 +202,7 @@ U_BOOT_DRIVER(testdevres_drv) = {
 	.of_match	= testdevres_ids,
 	.id	= UCLASS_TEST_DEVRES,
 	.bind	= testdevres_drv_bind,
-	.ofdata_to_platdata	= testdevres_drv_ofdata_to_platdata,
+	.of_to_plat	= testdevres_drv_of_to_plat,
 	.probe	= testdevres_drv_probe,
 	.plat_auto	= sizeof(struct dm_testdevres_pdata),
 	.priv_auto	= sizeof(struct dm_testdevres_priv),
@@ -1084,7 +1084,7 @@ static int dm_test_child_ofdata(struct unit_test_state *uts)
 
 	ut_assertok(uclass_first_device_err(UCLASS_TEST_BUS, &bus));
 	count = 0;
-	device_foreach_child_ofdata_to_platdata(dev, bus) {
+	device_foreach_child_of_to_plat(dev, bus) {
 		ut_assert(dev->flags & DM_FLAG_PLATDATA_VALID);
 		ut_assert(!(dev->flags & DM_FLAG_ACTIVATED));
 		count++;
@@ -1128,7 +1128,7 @@ static int dm_test_ofdata_order(struct unit_test_state *uts)
 	ut_assert(!(dev->flags & DM_FLAG_PLATDATA_VALID));
 
 	/* read the child's ofdata which should cause the parent's to be read */
-	ut_assertok(device_ofdata_to_platdata(dev));
+	ut_assertok(device_of_to_plat(dev));
 	ut_assert(dev->flags & DM_FLAG_PLATDATA_VALID);
 	ut_assert(bus->flags & DM_FLAG_PLATDATA_VALID);
 
