dm: treewide: Rename ofdata_to_platdata() to of_to_plat()

This name is far too long. Rename it to remove the 'data' bits. This makes
it consistent with the platdata->plat rename.

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

27 files changed, 51 insertions, 51 deletions

diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index e855ca472c..af7fe39e20 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 8d27382ee3..fe6550551d 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 6bc8c99435..6f80e02a0a 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 85745610a3..2deb14d5d1 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -201,7 +201,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;
@@ -241,7 +241,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 8964fa75fc..dae55ea6f4 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 1d64496bf0..a53288dc91 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 6d7a87cf65..967f8421ab 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 dba0ae45fb..ece27aca88 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 a0ae2fe0a4..6dc81a775d 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 2ee7e2d5de..55da805b8e 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 e6b73e133e..56362339be 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 cddebc38cb..12b2df2e56 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 997426d56d..ac3727d1c2 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 3b088b3b23..024c2c956e 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 afa6e8c8a9..665b2aa3b2 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 b1da874645..f4676f0b8e 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 a228bc4c9e..9602ddc7e0 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 26e03b8620..2b0a3e4d06 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 0e67bc124b..3b795785f7 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 5ca1c07b9d..45bc1de059 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 c5c706b153..dfd95a0b77 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 03a85c078a..5a333c4bb0 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 d1f24bb27a..a961ead1d4 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 e9d4d91b45..5248c6814c 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 9b56b2439c..63344b3418 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 ea90fdbf38..df4877a0b9 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 1bcdf8cb10..1d748e16ee 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,