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/pxa_mmc_gen.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/pxa_mmc_gen.c')
| -rw-r--r-- | drivers/mmc/pxa_mmc_gen.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c index 2c081fdc69f..2b45549a143 100644 --- a/drivers/mmc/pxa_mmc_gen.c +++ b/drivers/mmc/pxa_mmc_gen.c @@ -459,7 +459,7 @@ err0: static int pxa_mmc_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct pxa_mmc_plat *plat = dev_get_platdata(dev); + struct pxa_mmc_plat *plat = dev_get_plat(dev); struct mmc_config *cfg = &plat->cfg; struct mmc *mmc = &plat->mmc; struct pxa_mmc_priv *priv = dev_get_priv(dev); @@ -494,7 +494,7 @@ static int pxa_mmc_probe(struct udevice *dev) static int pxa_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data) { - struct pxa_mmc_plat *plat = dev_get_platdata(dev); + struct pxa_mmc_plat *plat = dev_get_plat(dev); struct pxa_mmc_priv *priv = dev_get_priv(dev); return pxa_mmc_send_cmd_common(priv, &plat->mmc, cmd, data); @@ -502,7 +502,7 @@ static int pxa_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, static int pxa_mmc_set_ios(struct udevice *dev) { - struct pxa_mmc_plat *plat = dev_get_platdata(dev); + struct pxa_mmc_plat *plat = dev_get_plat(dev); struct pxa_mmc_priv *priv = dev_get_priv(dev); return pxa_mmc_set_ios_common(priv, &plat->mmc); @@ -517,7 +517,7 @@ static const struct dm_mmc_ops pxa_mmc_ops = { #if CONFIG_IS_ENABLED(BLK) static int pxa_mmc_bind(struct udevice *dev) { - struct pxa_mmc_plat *plat = dev_get_platdata(dev); + struct pxa_mmc_plat *plat = dev_get_plat(dev); return mmc_bind(dev, &plat->mmc, &plat->cfg); } @@ -530,7 +530,7 @@ U_BOOT_DRIVER(pxa_mmc) = { .id = UCLASS_MMC, .name = "pxa_mmc", .ops = &pxa_mmc_ops, - .priv_auto_alloc_size = sizeof(struct pxa_mmc_priv), + .priv_auto = sizeof(struct pxa_mmc_priv), .probe = pxa_mmc_probe, }; #endif /* !CONFIG_IS_ENABLED(DM_MMC) */ |