diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-11 13:55:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-11 13:55:03 -0500 |
| commit | d71be1990218957b9f05dbf13a72859a2abe06d7 (patch) | |
| tree | 99858dc9988f7f7b4c0ab1d8d45738e3abdf38c8 /drivers/mmc/xenon_sdhci.c | |
| parent | c4fddedc48f336eabc4ce3f74940e6aa372de18c (diff) | |
| parent | bc0b99bd8b19599f670f42401de655fa9b44cd94 (diff) | |
Merge branch 'next'
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/mmc/xenon_sdhci.c')
| -rw-r--r-- | drivers/mmc/xenon_sdhci.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c index 6ce9d00d0a..b8e833e6a3 100644 --- a/drivers/mmc/xenon_sdhci.c +++ b/drivers/mmc/xenon_sdhci.c @@ -442,7 +442,7 @@ static const struct sdhci_ops xenon_sdhci_ops = { static int xenon_sdhci_probe(struct udevice *dev) { - struct xenon_sdhci_plat *plat = dev_get_platdata(dev); + struct xenon_sdhci_plat *plat = dev_get_plat(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct xenon_sdhci_priv *priv = dev_get_priv(dev); struct sdhci_host *host = dev_get_priv(dev); @@ -515,7 +515,7 @@ static int xenon_sdhci_probe(struct udevice *dev) return ret; } -static int xenon_sdhci_ofdata_to_platdata(struct udevice *dev) +static int xenon_sdhci_of_to_plat(struct udevice *dev) { struct sdhci_host *host = dev_get_priv(dev); struct xenon_sdhci_priv *priv = dev_get_priv(dev); @@ -545,7 +545,7 @@ static int xenon_sdhci_ofdata_to_platdata(struct udevice *dev) static int xenon_sdhci_bind(struct udevice *dev) { - struct xenon_sdhci_plat *plat = dev_get_platdata(dev); + struct xenon_sdhci_plat *plat = dev_get_plat(dev); return sdhci_bind(dev, &plat->mmc, &plat->cfg); } @@ -560,10 +560,10 @@ U_BOOT_DRIVER(xenon_sdhci_drv) = { .name = "xenon_sdhci", .id = UCLASS_MMC, .of_match = xenon_sdhci_ids, - .ofdata_to_platdata = xenon_sdhci_ofdata_to_platdata, + .of_to_plat = xenon_sdhci_of_to_plat, .ops = &sdhci_ops, .bind = xenon_sdhci_bind, .probe = xenon_sdhci_probe, - .priv_auto_alloc_size = sizeof(struct xenon_sdhci_priv), - .platdata_auto_alloc_size = sizeof(struct xenon_sdhci_plat), + .priv_auto = sizeof(struct xenon_sdhci_priv), + .plat_auto = sizeof(struct xenon_sdhci_plat), }; |