common: Drop asm/global_data.h from common header

[u-boot.git] / drivers / mmc / iproc_sdhci.c

diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c
index c2319b4134535f9f5f066a9d8054a4c92ee3d525..6e4f527e5d83d07bc0d0abcd509433008d1bf354 100644 (file)
--- a/drivers/mmc/iproc_sdhci.c
+++ b/drivers/mmc/iproc_sdhci.c
@@ -9,6 +9,8 @@
 #include <errno.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <asm/global_data.h>
+#include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -171,7 +173,7 @@ struct iproc_sdhci_plat {
 static int iproc_sdhci_probe(struct udevice *dev)
 {
        struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
-       struct iproc_sdhci_plat *plat = dev_get_platdata(dev);
+       struct iproc_sdhci_plat *plat = dev_get_plat(dev);
        struct sdhci_host *host = dev_get_priv(dev);
        struct sdhci_iproc_host *iproc_host;
        int node = dev_of_offset(dev);
@@ -187,7 +189,7 @@ static int iproc_sdhci_probe(struct udevice *dev)
        iproc_host->shadow_blk = 0;
 
        host->name = dev->name;
-       host->ioaddr = (void *)devfdt_get_addr(dev);
+       host->ioaddr = dev_read_addr_ptr(dev);
        host->voltages = MMC_VDD_165_195 |
                         MMC_VDD_32_33 | MMC_VDD_33_34;
        host->quirks = SDHCI_QUIRK_BROKEN_VOLTAGE | SDHCI_QUIRK_BROKEN_R1B;
@@ -229,7 +231,7 @@ static int iproc_sdhci_probe(struct udevice *dev)
 
 static int iproc_sdhci_bind(struct udevice *dev)
 {
-       struct iproc_sdhci_plat *plat = dev_get_platdata(dev);
+       struct iproc_sdhci_plat *plat = dev_get_plat(dev);
 
        return sdhci_bind(dev, &plat->mmc, &plat->cfg);
 }
@@ -246,6 +248,6 @@ U_BOOT_DRIVER(iproc_sdhci_drv) = {
        .ops = &sdhci_ops,
        .bind = iproc_sdhci_bind,
        .probe = iproc_sdhci_probe,
-       .priv_auto_alloc_size = sizeof(struct sdhci_host),
-       .platdata_auto_alloc_size = sizeof(struct iproc_sdhci_plat),
+       .priv_auto      = sizeof(struct sdhci_host),
+       .plat_auto      = sizeof(struct iproc_sdhci_plat),
 };