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

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

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

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

48 files changed, 52 insertions, 52 deletions

diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c
index 926fba68638..2015e31b724 100644
--- a/drivers/mmc/am654_sdhci.c
+++ b/drivers/mmc/am654_sdhci.c
@@ -495,5 +495,5 @@ U_BOOT_DRIVER(am654_sdhci_drv) = {
 	.bind		= am654_sdhci_bind,
 	.probe		= am654_sdhci_probe,
 	.priv_auto	= sizeof(struct sdhci_host),
-	.platdata_auto	= sizeof(struct am654_sdhci_plat),
+	.plat_auto	= sizeof(struct am654_sdhci_plat),
 };
diff --git a/drivers/mmc/arm_pl180_mmci.c b/drivers/mmc/arm_pl180_mmci.c
index 6c118b48190..6d983d0b020 100644
--- a/drivers/mmc/arm_pl180_mmci.c
+++ b/drivers/mmc/arm_pl180_mmci.c
@@ -552,6 +552,6 @@ U_BOOT_DRIVER(arm_pl180_mmc) = {
 	.ofdata_to_platdata = arm_pl180_mmc_ofdata_to_platdata,
 	.bind = arm_pl180_mmc_bind,
 	.priv_auto	= sizeof(struct pl180_mmc_host),
-	.platdata_auto	= sizeof(struct arm_pl180_mmc_plat),
+	.plat_auto	= sizeof(struct arm_pl180_mmc_plat),
 };
 #endif
diff --git a/drivers/mmc/aspeed_sdhci.c b/drivers/mmc/aspeed_sdhci.c
index 4bf02c3bb47..1e340f82a10 100644
--- a/drivers/mmc/aspeed_sdhci.c
+++ b/drivers/mmc/aspeed_sdhci.c
@@ -87,5 +87,5 @@ U_BOOT_DRIVER(aspeed_sdhci_drv) = {
 	.bind		= aspeed_sdhci_bind,
 	.probe		= aspeed_sdhci_probe,
 	.priv_auto	= sizeof(struct sdhci_host),
-	.platdata_auto	= sizeof(struct aspeed_sdhci_plat),
+	.plat_auto	= sizeof(struct aspeed_sdhci_plat),
 };
diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c
index 6f3b21b98d2..ee5d0dc4d70 100644
--- a/drivers/mmc/atmel_sdhci.c
+++ b/drivers/mmc/atmel_sdhci.c
@@ -131,6 +131,6 @@ U_BOOT_DRIVER(atmel_sdhci_drv) = {
 	.bind		= atmel_sdhci_bind,
 	.probe		= atmel_sdhci_probe,
 	.priv_auto	= sizeof(struct sdhci_host),
-	.platdata_auto	= sizeof(struct atmel_sdhci_plat),
+	.plat_auto	= sizeof(struct atmel_sdhci_plat),
 };
 #endif
diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c
index 7beb3b562cf..958129ca2a5 100644
--- a/drivers/mmc/bcm2835_sdhci.c
+++ b/drivers/mmc/bcm2835_sdhci.c
@@ -251,6 +251,6 @@ U_BOOT_DRIVER(sdhci_cdns) = {
 	.bind = bcm2835_sdhci_bind,
 	.probe = bcm2835_sdhci_probe,
 	.priv_auto	= sizeof(struct bcm2835_sdhci_host),
-	.platdata_auto	= sizeof(struct bcm2835_sdhci_plat),
+	.plat_auto	= sizeof(struct bcm2835_sdhci_plat),
 	.ops = &sdhci_ops,
 };
diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c
index 06bebc27d3b..8531f54c522 100644
--- a/drivers/mmc/bcm2835_sdhost.c
+++ b/drivers/mmc/bcm2835_sdhost.c
@@ -807,6 +807,6 @@ U_BOOT_DRIVER(bcm2835_sdhost) = {
 	.bind = bcm2835_bind,
 	.probe = bcm2835_probe,
 	.priv_auto	= sizeof(struct bcm2835_host),
-	.platdata_auto	= sizeof(struct bcm2835_plat),
+	.plat_auto	= sizeof(struct bcm2835_plat),
 	.ops = &bcm2835_ops,
 };
diff --git a/drivers/mmc/bcmstb_sdhci.c b/drivers/mmc/bcmstb_sdhci.c
index a92467f8004..e8041eb30fd 100644
--- a/drivers/mmc/bcmstb_sdhci.c
+++ b/drivers/mmc/bcmstb_sdhci.c
@@ -101,5 +101,5 @@ U_BOOT_DRIVER(sdhci_bcmstb) = {
 	.bind = sdhci_bcmstb_bind,
 	.probe = sdhci_bcmstb_probe,
 	.priv_auto	= sizeof(struct sdhci_host),
-	.platdata_auto	= sizeof(struct sdhci_bcmstb_plat),
+	.plat_auto	= sizeof(struct sdhci_bcmstb_plat),
 };
diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c
index 98d7f6b0b53..f295c541344 100644
--- a/drivers/mmc/ca_dw_mmc.c
+++ b/drivers/mmc/ca_dw_mmc.c
@@ -167,5 +167,5 @@ U_BOOT_DRIVER(ca_dwmmc_drv) = {
 	.ops		= &ca_dwmci_dm_ops,
 	.probe		= ca_dwmmc_probe,
 	.priv_auto	= sizeof(struct ca_dwmmc_priv_data),
-	.platdata_auto	= sizeof(struct ca_mmc_plat),
+	.plat_auto	= sizeof(struct ca_mmc_plat),
 };
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index 0b9669abbc8..d3562c39a98 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -527,7 +527,7 @@ U_BOOT_DRIVER(ti_da830_mmc) = {
 	.id		= UCLASS_MMC,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.of_match	= davinci_mmc_ids,
-	.platdata_auto	= sizeof(struct davinci_mmc_plat),
+	.plat_auto	= sizeof(struct davinci_mmc_plat),
 	.ofdata_to_platdata = davinci_mmc_ofdata_to_platdata,
 #endif
 #if CONFIG_BLK
diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index 63d00a3141f..5cc28c53c20 100644
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -307,6 +307,6 @@ U_BOOT_DRIVER(exynos_dwmmc_drv) = {
 	.ops		= &dm_dwmci_ops,
 	.probe		= exynos_dwmmc_probe,
 	.priv_auto	= sizeof(struct dwmci_exynos_priv_data),
-	.platdata_auto	= sizeof(struct exynos_mmc_plat),
+	.plat_auto	= sizeof(struct exynos_mmc_plat),
 };
 #endif
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 0a644853f1a..ad0dada5a4f 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -1136,7 +1136,7 @@ U_BOOT_DRIVER(fsl_esdhc) = {
 	.ops	= &fsl_esdhc_ops,
 	.bind	= fsl_esdhc_bind,
 	.probe	= fsl_esdhc_probe,
-	.platdata_auto	= sizeof(struct fsl_esdhc_plat),
+	.plat_auto	= sizeof(struct fsl_esdhc_plat),
 	.priv_auto	= sizeof(struct fsl_esdhc_priv),
 };
 #endif
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 25129fd690e..54a42e0274f 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -1707,7 +1707,7 @@ U_BOOT_DRIVER(fsl_esdhc) = {
 	.bind	= fsl_esdhc_bind,
 #endif
 	.probe	= fsl_esdhc_probe,
-	.platdata_auto	= sizeof(struct fsl_esdhc_plat),
+	.plat_auto	= sizeof(struct fsl_esdhc_plat),
 	.priv_auto	= sizeof(struct fsl_esdhc_priv),
 };
 
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
index 5d312df2b48..196c52776e3 100644
--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
@@ -478,5 +478,5 @@ U_BOOT_DRIVER(ftsdc010_mmc) = {
 	.bind		= ftsdc010_mmc_bind,
 	.probe		= ftsdc010_mmc_probe,
 	.priv_auto	= sizeof(struct ftsdc_priv),
-	.platdata_auto	= sizeof(struct ftsdc010_plat),
+	.plat_auto	= sizeof(struct ftsdc010_plat),
 };
diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c
index c135ee9b7ca..6f056aecb6d 100644
--- a/drivers/mmc/gen_atmel_mci.c
+++ b/drivers/mmc/gen_atmel_mci.c
@@ -624,7 +624,7 @@ U_BOOT_DRIVER(atmel_mci) = {
 	.of_match = atmel_mci_ids,
 	.bind = atmel_mci_bind,
 	.probe = atmel_mci_probe,
-	.platdata_auto	= sizeof(struct atmel_mci_plat),
+	.plat_auto	= sizeof(struct atmel_mci_plat),
 	.priv_auto	= sizeof(struct atmel_mci_priv),
 	.ops = &atmel_mci_mmc_ops,
 };
diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c
index cdc9a44e3e6..ae9f5a03102 100644
--- a/drivers/mmc/hi6220_dw_mmc.c
+++ b/drivers/mmc/hi6220_dw_mmc.c
@@ -113,5 +113,5 @@ U_BOOT_DRIVER(hi6220_dwmmc_drv) = {
 	.bind = hi6220_dwmmc_bind,
 	.probe = hi6220_dwmmc_probe,
 	.priv_auto	= sizeof(struct hi6220_dwmmc_priv_data),
-	.platdata_auto	= sizeof(struct hi6220_dwmmc_plat),
+	.plat_auto	= sizeof(struct hi6220_dwmmc_plat),
 };
diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c
index e5c453e2159..a85697cfa83 100644
--- a/drivers/mmc/iproc_sdhci.c
+++ b/drivers/mmc/iproc_sdhci.c
@@ -248,5 +248,5 @@ U_BOOT_DRIVER(iproc_sdhci_drv) = {
 	.bind = iproc_sdhci_bind,
 	.probe = iproc_sdhci_probe,
 	.priv_auto	= sizeof(struct sdhci_host),
-	.platdata_auto	= sizeof(struct iproc_sdhci_plat),
+	.plat_auto	= sizeof(struct iproc_sdhci_plat),
 };
diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c
index e3a28234463..99f2c2f40dd 100644
--- a/drivers/mmc/jz_mmc.c
+++ b/drivers/mmc/jz_mmc.c
@@ -502,7 +502,7 @@ U_BOOT_DRIVER(jz_mmc_drv) = {
 	.bind			= jz_mmc_bind,
 	.probe			= jz_mmc_probe,
 	.priv_auto	= sizeof(struct jz_mmc_priv),
-	.platdata_auto	= sizeof(struct jz_mmc_plat),
+	.plat_auto	= sizeof(struct jz_mmc_plat),
 	.ops			= &jz_msc_ops,
 };
 #endif /* CONFIG_DM_MMC */
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index a03a37783da..6a9662f69ab 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -340,7 +340,7 @@ U_BOOT_DRIVER(meson_mmc) = {
 	.probe = meson_mmc_probe,
 	.bind = meson_mmc_bind,
 	.ofdata_to_platdata = meson_mmc_ofdata_to_platdata,
-	.platdata_auto	= sizeof(struct meson_mmc_platdata),
+	.plat_auto	= sizeof(struct meson_mmc_platdata),
 };
 
 #ifdef CONFIG_PWRSEQ
diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c
index 269f31afeee..53eabc9e612 100644
--- a/drivers/mmc/mmc-uclass.c
+++ b/drivers/mmc/mmc-uclass.c
@@ -321,7 +321,7 @@ struct blk_desc *mmc_get_blk_desc(struct mmc *mmc)
 	device_find_first_child(mmc->dev, &dev);
 	if (!dev)
 		return NULL;
-	desc = dev_get_uclass_platdata(dev);
+	desc = dev_get_uclass_plat(dev);
 
 	return desc;
 }
@@ -399,7 +399,7 @@ int mmc_bind(struct udevice *dev, struct mmc *mmc, const struct mmc_config *cfg)
 		debug("Cannot create block device\n");
 		return ret;
 	}
-	bdesc = dev_get_uclass_platdata(bdev);
+	bdesc = dev_get_uclass_plat(bdev);
 	mmc->cfg = cfg;
 	mmc->priv = dev;
 
@@ -435,7 +435,7 @@ static int mmc_select_hwpart(struct udevice *bdev, int hwpart)
 {
 	struct udevice *mmc_dev = dev_get_parent(bdev);
 	struct mmc *mmc = mmc_get_mmc_dev(mmc_dev);
-	struct blk_desc *desc = dev_get_uclass_platdata(bdev);
+	struct blk_desc *desc = dev_get_uclass_plat(bdev);
 	int ret;
 
 	if (desc->hwpart == hwpart)
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index a6394bcf308..36aab50f64e 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -454,7 +454,7 @@ ulong mmc_bread(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt,
 #endif
 {
 #if CONFIG_IS_ENABLED(BLK)
-	struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
+	struct blk_desc *block_dev = dev_get_uclass_plat(dev);
 #endif
 	int dev_num = block_dev->devnum;
 	int err;
diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c
index 31c8f06ca65..d0c439729fe 100644
--- a/drivers/mmc/mmc_spi.c
+++ b/drivers/mmc/mmc_spi.c
@@ -468,6 +468,6 @@ U_BOOT_DRIVER(mmc_spi) = {
 	.ops = &mmc_spi_ops,
 	.probe = mmc_spi_probe,
 	.bind = mmc_spi_bind,
-	.platdata_auto	= sizeof(struct mmc_spi_plat),
+	.plat_auto	= sizeof(struct mmc_spi_plat),
 	.priv_auto	= sizeof(struct mmc_spi_priv),
 };
diff --git a/drivers/mmc/mmc_write.c b/drivers/mmc/mmc_write.c
index 6a4453ca02e..d23b7d9729f 100644
--- a/drivers/mmc/mmc_write.c
+++ b/drivers/mmc/mmc_write.c
@@ -73,7 +73,7 @@ ulong mmc_berase(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt)
 #endif
 {
 #if CONFIG_IS_ENABLED(BLK)
-	struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
+	struct blk_desc *block_dev = dev_get_uclass_plat(dev);
 #endif
 	int dev_num = block_dev->devnum;
 	int err = 0;
@@ -193,7 +193,7 @@ ulong mmc_bwrite(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt,
 #endif
 {
 #if CONFIG_IS_ENABLED(BLK)
-	struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
+	struct blk_desc *block_dev = dev_get_uclass_plat(dev);
 #endif
 	int dev_num = block_dev->devnum;
 	lbaint_t cur, blocks_todo = blkcnt;
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index 049dd33ce4f..45bf269a534 100644
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -209,5 +209,5 @@ U_BOOT_DRIVER(msm_sdc_drv) = {
 	.probe		= msm_sdc_probe,
 	.remove		= msm_sdc_remove,
 	.priv_auto	= sizeof(struct msm_sdhc),
-	.platdata_auto	= sizeof(struct msm_sdhc_plat),
+	.plat_auto	= sizeof(struct msm_sdhc_plat),
 };
diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c
index d701a4cd008..59217e59b05 100644
--- a/drivers/mmc/mtk-sd.c
+++ b/drivers/mmc/mtk-sd.c
@@ -1692,6 +1692,6 @@ U_BOOT_DRIVER(mtk_sd_drv) = {
 	.bind = msdc_drv_bind,
 	.probe = msdc_drv_probe,
 	.ops = &msdc_ops,
-	.platdata_auto	= sizeof(struct msdc_plat),
+	.plat_auto	= sizeof(struct msdc_plat),
 	.priv_auto	= sizeof(struct msdc_host),
 };
diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
index fb803e3be7d..4cc16131c28 100644
--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
@@ -152,6 +152,6 @@ U_BOOT_DRIVER(mv_sdhci_drv) = {
 	.probe		= mv_sdhci_probe,
 	.ops		= &sdhci_ops,
 	.priv_auto	= sizeof(struct sdhci_host),
-	.platdata_auto	= sizeof(struct mv_sdhci_plat),
+	.plat_auto	= sizeof(struct mv_sdhci_plat),
 };
 #endif /* CONFIG_DM_MMC */
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c
index fd43f27ade5..a313791586d 100644
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -668,7 +668,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)
 {
-	struct mxsmmc_platdata *plat = bus->platdata;
+	struct mxsmmc_platdata *plat = bus->plat;
 	u32 prop[2];
 	int ret;
 
@@ -719,7 +719,7 @@ U_BOOT_DRIVER(fsl_imx23_mmc) = {
 #endif
 	.probe	= mxsmmc_probe,
 	.priv_auto	= sizeof(struct mxsmmc_priv),
-	.platdata_auto	= sizeof(struct mxsmmc_platdata),
+	.plat_auto	= sizeof(struct mxsmmc_platdata),
 };
 
 U_BOOT_DRIVER_ALIAS(fsl_imx23_mmc, fsl_imx28_mmc)
diff --git a/drivers/mmc/nexell_dw_mmc.c b/drivers/mmc/nexell_dw_mmc.c
index 680459bae78..d03d589ac66 100644
--- a/drivers/mmc/nexell_dw_mmc.c
+++ b/drivers/mmc/nexell_dw_mmc.c
@@ -233,5 +233,5 @@ U_BOOT_DRIVER(nexell_dwmmc_drv) = {
 	.bind		= nexell_dwmmc_bind,
 	.probe		= nexell_dwmmc_probe,
 	.priv_auto	= sizeof(struct nexell_dwmmc_priv),
-	.platdata_auto	= sizeof(struct nexell_mmc_plat),
+	.plat_auto	= sizeof(struct nexell_mmc_plat),
 };
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 31003b3cb78..658fd928304 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -2029,7 +2029,7 @@ U_BOOT_DRIVER(omap_hsmmc) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = omap_hsmmc_ids,
 	.ofdata_to_platdata = omap_hsmmc_ofdata_to_platdata,
-	.platdata_auto	= sizeof(struct omap_hsmmc_plat),
+	.plat_auto	= sizeof(struct omap_hsmmc_plat),
 #endif
 #ifdef CONFIG_BLK
 	.bind = omap_hsmmc_bind,
diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c
index 004b3cb7ea5..d2cc58fa30e 100644
--- a/drivers/mmc/pci_mmc.c
+++ b/drivers/mmc/pci_mmc.c
@@ -133,7 +133,7 @@ U_BOOT_DRIVER(pci_mmc) = {
 	.probe	= pci_mmc_probe,
 	.ops	= &sdhci_ops,
 	.priv_auto	= sizeof(struct pci_mmc_priv),
-	.platdata_auto	= sizeof(struct pci_mmc_plat),
+	.plat_auto	= sizeof(struct pci_mmc_plat),
 	ACPI_OPS_PTR(&pci_mmc_acpi_ops)
 };
 
diff --git a/drivers/mmc/pic32_sdhci.c b/drivers/mmc/pic32_sdhci.c
index dd10624dbfe..04eece59252 100644
--- a/drivers/mmc/pic32_sdhci.c
+++ b/drivers/mmc/pic32_sdhci.c
@@ -89,5 +89,5 @@ U_BOOT_DRIVER(pic32_sdhci_drv) = {
 	.bind			= pic32_sdhci_bind,
 	.probe			= pic32_sdhci_probe,
 	.priv_auto	= sizeof(struct sdhci_host),
-	.platdata_auto	= sizeof(struct pic32_sdhci_plat)
+	.plat_auto	= sizeof(struct pic32_sdhci_plat)
 };
diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index 211e6904639..37c80ef1af1 100644
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -1015,6 +1015,6 @@ U_BOOT_DRIVER(renesas_sdhi) = {
 	.bind = tmio_sd_bind,
 	.probe = renesas_sdhi_probe,
 	.priv_auto	= sizeof(struct tmio_sd_priv),
-	.platdata_auto	= sizeof(struct tmio_sd_plat),
+	.plat_auto	= sizeof(struct tmio_sd_plat),
 	.ops = &renesas_sdhi_ops,
 };
diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c
index e4c5288876f..67eb89b2a3e 100644
--- a/drivers/mmc/rockchip_dw_mmc.c
+++ b/drivers/mmc/rockchip_dw_mmc.c
@@ -177,7 +177,7 @@ U_BOOT_DRIVER(rockchip_rk3288_dw_mshc) = {
 	.bind		= rockchip_dwmmc_bind,
 	.probe		= rockchip_dwmmc_probe,
 	.priv_auto	= sizeof(struct rockchip_dwmmc_priv),
-	.platdata_auto	= sizeof(struct rockchip_mmc_plat),
+	.plat_auto	= sizeof(struct rockchip_mmc_plat),
 };
 
 U_BOOT_DRIVER_ALIAS(rockchip_rk3288_dw_mshc, rockchip_rk3328_dw_mshc)
diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c
index 131c976eaf6..427d41ec62a 100644
--- a/drivers/mmc/rockchip_sdhci.c
+++ b/drivers/mmc/rockchip_sdhci.c
@@ -115,5 +115,5 @@ U_BOOT_DRIVER(arasan_sdhci_drv) = {
 	.bind		= rockchip_sdhci_bind,
 	.probe		= arasan_sdhci_probe,
 	.priv_auto	= sizeof(struct rockchip_sdhc),
-	.platdata_auto	= sizeof(struct rockchip_sdhc_plat),
+	.plat_auto	= sizeof(struct rockchip_sdhc_plat),
 };
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index 6841be6a145..82aff9caaf5 100644
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -247,6 +247,6 @@ U_BOOT_DRIVER(s5p_sdhci_drv) = {
 	.ops		= &sdhci_ops,
 	.probe		= s5p_sdhci_probe,
 	.priv_auto	= sizeof(struct sdhci_host),
-	.platdata_auto	= sizeof(struct s5p_sdhci_plat),
+	.plat_auto	= sizeof(struct s5p_sdhci_plat),
 };
 #endif /* CONFIG_DM_MMC */
diff --git a/drivers/mmc/sandbox_mmc.c b/drivers/mmc/sandbox_mmc.c
index ece0e2d31cb..17c6cea1dc1 100644
--- a/drivers/mmc/sandbox_mmc.c
+++ b/drivers/mmc/sandbox_mmc.c
@@ -148,5 +148,5 @@ U_BOOT_DRIVER(mmc_sandbox) = {
 	.bind		= sandbox_mmc_bind,
 	.unbind		= sandbox_mmc_unbind,
 	.probe		= sandbox_mmc_probe,
-	.platdata_auto	= sizeof(struct sandbox_mmc_plat),
+	.plat_auto	= sizeof(struct sandbox_mmc_plat),
 };
diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c
index efc09b91998..ffbac448cd9 100644
--- a/drivers/mmc/sdhci-cadence.c
+++ b/drivers/mmc/sdhci-cadence.c
@@ -310,6 +310,6 @@ U_BOOT_DRIVER(sdhci_cdns) = {
 	.bind = sdhci_cdns_bind,
 	.probe = sdhci_cdns_probe,
 	.priv_auto	= sizeof(struct sdhci_host),
-	.platdata_auto	= sizeof(struct sdhci_cdns_plat),
+	.plat_auto	= sizeof(struct sdhci_cdns_plat),
 	.ops = &sdhci_cdns_mmc_ops,
 };
diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c
index f3d10ac8be6..723e3e3862c 100644
--- a/drivers/mmc/sh_mmcif.c
+++ b/drivers/mmc/sh_mmcif.c
@@ -744,7 +744,7 @@ U_BOOT_DRIVER(sh_mmcif_mmc) = {
 	.bind			= sh_mmcif_dm_bind,
 	.probe			= sh_mmcif_dm_probe,
 	.priv_auto	= sizeof(struct sh_mmcif_host),
-	.platdata_auto	= sizeof(struct sh_mmcif_plat),
+	.plat_auto	= sizeof(struct sh_mmcif_plat),
 	.ops			= &sh_mmcif_dm_ops,
 };
 #endif
diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
index 04ce521a515..9fcd0e0e9cc 100644
--- a/drivers/mmc/sh_sdhi.c
+++ b/drivers/mmc/sh_sdhi.c
@@ -903,7 +903,7 @@ U_BOOT_DRIVER(sh_sdhi_mmc) = {
 	.bind			= sh_sdhi_dm_bind,
 	.probe			= sh_sdhi_dm_probe,
 	.priv_auto	= sizeof(struct sh_sdhi_host),
-	.platdata_auto	= sizeof(struct sh_sdhi_plat),
+	.plat_auto	= sizeof(struct sh_sdhi_plat),
 	.ops			= &sh_sdhi_dm_ops,
 };
 #endif
diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c
index 009933de5ef..0533bc2ff63 100644
--- a/drivers/mmc/snps_dw_mmc.c
+++ b/drivers/mmc/snps_dw_mmc.c
@@ -196,5 +196,5 @@ U_BOOT_DRIVER(snps_dwmmc_drv) = {
 	.bind				= snps_dwmmc_bind,
 	.probe				= snps_dwmmc_probe,
 	.priv_auto		= sizeof(struct snps_dwmci_priv_data),
-	.platdata_auto	= sizeof(struct snps_dwmci_plat),
+	.plat_auto	= sizeof(struct snps_dwmci_plat),
 };
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c
index 80c4d6ed4d4..2d5efb912b8 100644
--- a/drivers/mmc/socfpga_dw_mmc.c
+++ b/drivers/mmc/socfpga_dw_mmc.c
@@ -190,5 +190,5 @@ U_BOOT_DRIVER(socfpga_dwmmc_drv) = {
 	.bind		= socfpga_dwmmc_bind,
 	.probe		= socfpga_dwmmc_probe,
 	.priv_auto	= sizeof(struct dwmci_socfpga_priv_data),
-	.platdata_auto	= sizeof(struct socfpga_dwmci_plat),
+	.plat_auto	= sizeof(struct socfpga_dwmci_plat),
 };
diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c
index 49ddabcbe5e..1da569c75d2 100644
--- a/drivers/mmc/sti_sdhci.c
+++ b/drivers/mmc/sti_sdhci.c
@@ -145,5 +145,5 @@ U_BOOT_DRIVER(sti_mmc) = {
 	.ofdata_to_platdata = sti_sdhci_ofdata_to_platdata,
 	.probe = sti_sdhci_probe,
 	.priv_auto	= sizeof(struct sdhci_host),
-	.platdata_auto	= sizeof(struct sti_sdhci_plat),
+	.plat_auto	= sizeof(struct sti_sdhci_plat),
 };
diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c
index 80eecb60e8e..df5bb781c88 100644
--- a/drivers/mmc/stm32_sdmmc2.c
+++ b/drivers/mmc/stm32_sdmmc2.c
@@ -718,5 +718,5 @@ U_BOOT_DRIVER(stm32_sdmmc2) = {
 	.probe = stm32_sdmmc2_probe,
 	.bind = stm32_sdmmc_bind,
 	.priv_auto	= sizeof(struct stm32_sdmmc2_priv),
-	.platdata_auto	= sizeof(struct stm32_sdmmc2_plat),
+	.plat_auto	= sizeof(struct stm32_sdmmc2_plat),
 };
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index 12e8c99076b..7490e86960a 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -746,7 +746,7 @@ U_BOOT_DRIVER(sunxi_mmc_drv) = {
 	.bind		= sunxi_mmc_bind,
 	.probe		= sunxi_mmc_probe,
 	.ops		= &sunxi_mmc_ops,
-	.platdata_auto	= sizeof(struct sunxi_mmc_plat),
+	.plat_auto	= sizeof(struct sunxi_mmc_plat),
 	.priv_auto	= sizeof(struct sunxi_mmc_priv),
 };
 #endif
diff --git a/drivers/mmc/tangier_sdhci.c b/drivers/mmc/tangier_sdhci.c
index 46e185e3172..1a2a0ffd43c 100644
--- a/drivers/mmc/tangier_sdhci.c
+++ b/drivers/mmc/tangier_sdhci.c
@@ -77,5 +77,5 @@ U_BOOT_DRIVER(sdhci_tangier) = {
 	.probe		= sdhci_tangier_probe,
 	.ops		= &sdhci_ops,
 	.priv_auto	= sizeof(struct sdhci_host),
-	.platdata_auto	= sizeof(struct sdhci_tangier_plat),
+	.plat_auto	= sizeof(struct sdhci_tangier_plat),
 };
diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c
index f915c78f5d4..8a32156b801 100644
--- a/drivers/mmc/tegra_mmc.c
+++ b/drivers/mmc/tegra_mmc.c
@@ -771,6 +771,6 @@ U_BOOT_DRIVER(tegra_mmc_drv) = {
 	.bind		= tegra_mmc_bind,
 	.probe		= tegra_mmc_probe,
 	.ops		= &tegra_mmc_ops,
-	.platdata_auto	= sizeof(struct tegra_mmc_plat),
+	.plat_auto	= sizeof(struct tegra_mmc_plat),
 	.priv_auto	= sizeof(struct tegra_mmc_priv),
 };
diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c
index ca674272fc0..75003a0113e 100644
--- a/drivers/mmc/uniphier-sd.c
+++ b/drivers/mmc/uniphier-sd.c
@@ -85,6 +85,6 @@ U_BOOT_DRIVER(uniphier_mmc) = {
 	.bind = tmio_sd_bind,
 	.probe = uniphier_sd_probe,
 	.priv_auto	= sizeof(struct tmio_sd_priv),
-	.platdata_auto	= sizeof(struct tmio_sd_plat),
+	.plat_auto	= sizeof(struct tmio_sd_plat),
 	.ops = &uniphier_sd_ops,
 };
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index c0897258199..9925513c01f 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -565,5 +565,5 @@ U_BOOT_DRIVER(xenon_sdhci_drv) = {
 	.bind		= xenon_sdhci_bind,
 	.probe		= xenon_sdhci_probe,
 	.priv_auto	= sizeof(struct xenon_sdhci_priv),
-	.platdata_auto	= sizeof(struct xenon_sdhci_plat),
+	.plat_auto	= sizeof(struct xenon_sdhci_plat),
 };
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
index 2ef63976e96..919e5d77baa 100644
--- a/drivers/mmc/zynq_sdhci.c
+++ b/drivers/mmc/zynq_sdhci.c
@@ -660,5 +660,5 @@ U_BOOT_DRIVER(arasan_sdhci_drv) = {
 	.bind		= arasan_sdhci_bind,
 	.probe		= arasan_sdhci_probe,
 	.priv_auto	= sizeof(struct arasan_sdhci_priv),
-	.platdata_auto	= sizeof(struct arasan_sdhci_plat),
+	.plat_auto	= sizeof(struct arasan_sdhci_plat),
 };