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/jz_mmc.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/jz_mmc.c')
| -rw-r--r-- | drivers/mmc/jz_mmc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c index b33f085073..ae3af3927d 100644 --- a/drivers/mmc/jz_mmc.c +++ b/drivers/mmc/jz_mmc.c @@ -443,10 +443,10 @@ static const struct dm_mmc_ops jz_msc_ops = { .set_ios = jz_mmc_dm_set_ios, }; -static int jz_mmc_ofdata_to_platdata(struct udevice *dev) +static int jz_mmc_of_to_plat(struct udevice *dev) { struct jz_mmc_priv *priv = dev_get_priv(dev); - struct jz_mmc_plat *plat = dev_get_platdata(dev); + struct jz_mmc_plat *plat = dev_get_plat(dev); struct mmc_config *cfg; int ret; @@ -473,7 +473,7 @@ static int jz_mmc_ofdata_to_platdata(struct udevice *dev) static int jz_mmc_bind(struct udevice *dev) { - struct jz_mmc_plat *plat = dev_get_platdata(dev); + struct jz_mmc_plat *plat = dev_get_plat(dev); return mmc_bind(dev, &plat->mmc, &plat->cfg); } @@ -482,7 +482,7 @@ static int jz_mmc_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct jz_mmc_priv *priv = dev_get_priv(dev); - struct jz_mmc_plat *plat = dev_get_platdata(dev); + struct jz_mmc_plat *plat = dev_get_plat(dev); plat->mmc.priv = priv; upriv->mmc = &plat->mmc; @@ -498,11 +498,11 @@ U_BOOT_DRIVER(jz_mmc_drv) = { .name = "jz_mmc", .id = UCLASS_MMC, .of_match = jz_mmc_ids, - .ofdata_to_platdata = jz_mmc_ofdata_to_platdata, + .of_to_plat = jz_mmc_of_to_plat, .bind = jz_mmc_bind, .probe = jz_mmc_probe, - .priv_auto_alloc_size = sizeof(struct jz_mmc_priv), - .platdata_auto_alloc_size = sizeof(struct jz_mmc_plat), + .priv_auto = sizeof(struct jz_mmc_priv), + .plat_auto = sizeof(struct jz_mmc_plat), .ops = &jz_msc_ops, }; #endif /* CONFIG_DM_MMC */ |