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 926fba6..2015e31 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 6c118b4..6d983d0 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 4bf02c3..1e340f8 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 6f3b21b..ee5d0dc 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 7beb3b5..958129c 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 06bebc2..8531f54 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 a92467f..e8041eb 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 98d7f6b..f295c54 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 0b9669a..d3562c3 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 63d00a3..5cc28c5 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 0a64485..ad0dada 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 25129fd..54a42e0 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 5d312df..196c527 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 c135ee9..6f056ae 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 cdc9a44..ae9f5a0 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 e5c453e..a85697c 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 e3a2823..99f2c2f 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 a03a377..6a9662f 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 269f31a..53eabc9 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 a6394bc..36aab50 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 31c8f06..d0c4397 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 6a4453c..d23b7d9 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 049dd33..45bf269 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 d701a4c..59217e5 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 fb803e3..4cc1613 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 fd43f27..a313791 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 680459b..d03d589 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 31003b3..658fd92 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 004b3cb..d2cc58f 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 dd10624..04eece5 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 211e690..37c80ef 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 e4c5288..67eb89b 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 131c976..427d41e 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 6841be6..82aff9c 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 ece0e2d..17c6cea 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 efc09b9..ffbac44 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 f3d10ac..723e3e3 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 04ce521..9fcd0e0 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 009933d..0533bc2 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 80c4d6e..2d5efb9 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 49ddabc..1da569c 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 80eecb6..df5bb78 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 12e8c99..7490e86 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 46e185e..1a2a0ff 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 f915c78..8a32156 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 ca67427..75003a0 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 c0897258..9925513 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 2ef6397..919e5d7 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),
 };