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>
diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c
index c874151..84aca85 100644
--- a/drivers/spi/altera_spi.c
+++ b/drivers/spi/altera_spi.c
@@ -169,7 +169,7 @@
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 @@
.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 f62387c..9917b54 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -408,7 +408,7 @@
.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 83ca649..3afc051 100644
--- a/drivers/spi/bcmstb_spi.c
+++ b/drivers/spi/bcmstb_spi.c
@@ -94,7 +94,7 @@
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 @@
.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 f097fc1..2317d36 100644
--- a/drivers/spi/cadence_qspi.c
+++ b/drivers/spi/cadence_qspi.c
@@ -282,7 +282,7 @@
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 @@
.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 ce0584d..2ba523f 100644
--- a/drivers/spi/cf_spi.c
+++ b/drivers/spi/cf_spi.c
@@ -384,7 +384,7 @@
}
#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 @@
.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 c60f2fe..0f887ed 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -419,7 +419,7 @@
.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 9906909..5429ac7 100644
--- a/drivers/spi/designware_spi.c
+++ b/drivers/spi/designware_spi.c
@@ -153,7 +153,7 @@
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 @@
.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 0473736..9505d88 100644
--- a/drivers/spi/exynos_spi.c
+++ b/drivers/spi/exynos_spi.c
@@ -251,7 +251,7 @@
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 @@
.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 6ec85db..82aabe7 100644
--- a/drivers/spi/fsl_dspi.c
+++ b/drivers/spi/fsl_dspi.c
@@ -573,7 +573,7 @@
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 @@
.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 b8db2ee..0c40a4a 100644
--- a/drivers/spi/fsl_espi.c
+++ b/drivers/spi/fsl_espi.c
@@ -541,7 +541,7 @@
};
#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 @@
.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 b42b536..4c01ec8 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -945,7 +945,7 @@
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 @@
.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 9e0a1bb..669a44c 100644
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -230,7 +230,7 @@
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 @@
.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 74ff56d..02f8219 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -48,7 +48,7 @@
#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 @@
.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 3c4523a..32a26d4 100644
--- a/drivers/spi/mvebu_a3700_spi.c
+++ b/drivers/spi/mvebu_a3700_spi.c
@@ -279,7 +279,7 @@
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 @@
.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 3f7aade..0973d51 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -441,7 +441,7 @@
};
#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 @@
.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 f411341..04a296a 100644
--- a/drivers/spi/nxp_fspi.c
+++ b/drivers/spi/nxp_fspi.c
@@ -922,7 +922,7 @@
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 @@
.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 ea722e4..0594a9c 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -478,7 +478,7 @@
.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 @@
.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 3d14203..179582c 100644
--- a/drivers/spi/pl022_spi.c
+++ b/drivers/spi/pl022_spi.c
@@ -286,7 +286,7 @@
};
#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 @@
.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 87d6e48..7a030b1 100644
--- a/drivers/spi/renesas_rpc_spi.c
+++ b/drivers/spi/renesas_rpc_spi.c
@@ -417,7 +417,7 @@
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 @@
.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 63ed0b2..3a97fb5 100644
--- a/drivers/spi/rk_spi.c
+++ b/drivers/spi/rk_spi.c
@@ -192,7 +192,7 @@
}
#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);
@@ -560,7 +560,7 @@
.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 dd732dc..5ba8a8e 100644
--- a/drivers/spi/sh_qspi.c
+++ b/drivers/spi/sh_qspi.c
@@ -328,7 +328,7 @@
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 @@
.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 1967134..d4a886a 100644
--- a/drivers/spi/soft_spi.c
+++ b/drivers/spi/soft_spi.c
@@ -226,7 +226,7 @@
.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 @@
.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 8ee8c90..00703f9 100644
--- a/drivers/spi/spi-sunxi.c
+++ b/drivers/spi/spi-sunxi.c
@@ -514,7 +514,7 @@
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 @@
.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 26a8477..bba887c 100644
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -158,7 +158,7 @@
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 @@
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 7021f66..0798db7 100644
--- a/drivers/spi/tegra114_spi.c
+++ b/drivers/spi/tegra114_spi.c
@@ -97,7 +97,7 @@
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 @@
.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 53719c7..d27f679 100644
--- a/drivers/spi/tegra20_sflash.c
+++ b/drivers/spi/tegra20_sflash.c
@@ -87,7 +87,7 @@
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 @@
.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 55261a8..1a26e5c 100644
--- a/drivers/spi/tegra20_slink.c
+++ b/drivers/spi/tegra20_slink.c
@@ -93,7 +93,7 @@
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 @@
.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 a596052..99a5319 100644
--- a/drivers/spi/tegra210_qspi.c
+++ b/drivers/spi/tegra210_qspi.c
@@ -97,7 +97,7 @@
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 @@
.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 20fe581..f1511c0 100644
--- a/drivers/spi/ti_qspi.c
+++ b/drivers/spi/ti_qspi.c
@@ -452,7 +452,7 @@
#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 @@
.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 6d9fd3f..b6083e6 100644
--- a/drivers/spi/uniphier_spi.c
+++ b/drivers/spi/uniphier_spi.c
@@ -362,7 +362,7 @@
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 @@
.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 f0dbb1c..7da7903 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -98,7 +98,7 @@
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 @@
.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 b400959..285b006 100644
--- a/drivers/spi/zynq_spi.c
+++ b/drivers/spi/zynq_spi.c
@@ -73,7 +73,7 @@
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 @@
.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 07e84da..e3bfc6e 100644
--- a/drivers/spi/zynqmp_gqspi.c
+++ b/drivers/spi/zynqmp_gqspi.c
@@ -175,7 +175,7 @@
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 @@
.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,