x86: fsp: Only compile fsp_save_s3_stack if (SPL_)DM_RTC is enabled

[platform/kernel/u-boot.git] / drivers / mmc / sh_sdhi.c

diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
index 772fe94..3ce7cbf 100644 (file)
--- a/drivers/mmc/sh_sdhi.c
+++ b/drivers/mmc/sh_sdhi.c
@@ -24,6 +24,7 @@
 #include <linux/sizes.h>
 #include <asm/arch/rmobile.h>
 #include <asm/arch/sh_sdhi.h>
+#include <asm/global_data.h>
 #include <clk.h>
 
 #define DRIVER_NAME "sh-sdhi"
@@ -760,7 +761,7 @@ int sh_sdhi_init(unsigned long addr, int ch, unsigned long quirks)
        struct mmc *mmc;
        struct sh_sdhi_host *host = NULL;
 
-       if (ch >= CONFIG_SYS_SH_SDHI_NR_CHANNEL)
+       if (ch >= CFG_SYS_SH_SDHI_NR_CHANNEL)
                return -ENODEV;
 
        host = malloc(sizeof(struct sh_sdhi_host));
@@ -784,8 +785,7 @@ int sh_sdhi_init(unsigned long addr, int ch, unsigned long quirks)
 
        return ret;
 error:
-       if (host)
-               free(host);
+       free(host);
        return ret;
 }
 
@@ -819,14 +819,14 @@ static const struct dm_mmc_ops sh_sdhi_dm_ops = {
 
 static int sh_sdhi_dm_bind(struct udevice *dev)
 {
-       struct sh_sdhi_plat *plat = dev_get_platdata(dev);
+       struct sh_sdhi_plat *plat = dev_get_plat(dev);
 
        return mmc_bind(dev, &plat->mmc, &plat->cfg);
 }
 
 static int sh_sdhi_dm_probe(struct udevice *dev)
 {
-       struct sh_sdhi_plat *plat = dev_get_platdata(dev);
+       struct sh_sdhi_plat *plat = dev_get_plat(dev);
        struct sh_sdhi_host *host = dev_get_priv(dev);
        struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
        struct clk sh_sdhi_clk;
@@ -834,7 +834,7 @@ static int sh_sdhi_dm_probe(struct udevice *dev)
        fdt_addr_t base;
        int ret;
 
-       base = devfdt_get_addr(dev);
+       base = dev_read_addr(dev);
        if (base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
@@ -903,8 +903,8 @@ U_BOOT_DRIVER(sh_sdhi_mmc) = {
        .of_match               = sh_sdhi_sd_match,
        .bind                   = sh_sdhi_dm_bind,
        .probe                  = sh_sdhi_dm_probe,
-       .priv_auto_alloc_size   = sizeof(struct sh_sdhi_host),
-       .platdata_auto_alloc_size = sizeof(struct sh_sdhi_plat),
+       .priv_auto      = sizeof(struct sh_sdhi_host),
+       .plat_auto      = sizeof(struct sh_sdhi_plat),
        .ops                    = &sh_sdhi_dm_ops,
 };
 #endif