diff options
author | Tom Rini <trini@konsulko.com> | 2020-12-14 18:57:57 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-12-14 18:57:57 -0500 |
commit | 8351a29d2df18c92d8e365cfa848218c3859f3d2 (patch) | |
tree | 5d29001be9accfb8029df9d9ed78fba196ee07b9 /drivers/mmc/msm_sdhci.c | |
parent | ddaa94978583d07ec515e7226e397221d8cc44c8 (diff) | |
parent | b7bbd553de0d9752f919dfc616f560f6f2504c14 (diff) |
Merge tag 'dm-pull-14dec20' of git://git.denx.de/u-boot-dm into next
Driver model tidy-up for livetree
Driver model big rename for consistency
Python 3 clean-ups for patman
Update sandbox serial driver to use membuff
Diffstat (limited to 'drivers/mmc/msm_sdhci.c')
-rw-r--r-- | drivers/mmc/msm_sdhci.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c index 2a1f412278..bfbba46c5d 100644 --- a/drivers/mmc/msm_sdhci.c +++ b/drivers/mmc/msm_sdhci.c @@ -87,7 +87,7 @@ static int msm_sdc_clk_init(struct udevice *dev) static int msm_sdc_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct msm_sdhc_plat *plat = dev_get_platdata(dev); + struct msm_sdhc_plat *plat = dev_get_plat(dev); struct msm_sdhc *prv = dev_get_priv(dev); struct sdhci_host *host = &prv->host; u32 core_version, core_minor, core_major; @@ -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); @@ -189,7 +189,7 @@ static int msm_ofdata_to_platdata(struct udevice *dev) static int msm_sdc_bind(struct udevice *dev) { - struct msm_sdhc_plat *plat = dev_get_platdata(dev); + struct msm_sdhc_plat *plat = dev_get_plat(dev); return sdhci_bind(dev, &plat->mmc, &plat->cfg); } @@ -203,11 +203,11 @@ 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, .remove = msm_sdc_remove, - .priv_auto_alloc_size = sizeof(struct msm_sdhc), - .platdata_auto_alloc_size = sizeof(struct msm_sdhc_plat), + .priv_auto = sizeof(struct msm_sdhc), + .plat_auto = sizeof(struct msm_sdhc_plat), }; |