Prepare v2018.03-rc2

[oweals/u-boot.git] / drivers / mmc / dw_mmc.c

diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index 074f86c502c0d2aed6eb1c2ffeedfe5730fdbc81..23f642980bfa97ee41910c7ad0b1134eb8bc72e1 100644 (file)
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -184,7 +184,7 @@ static int dwmci_set_transfer_mode(struct dwmci_host *host,
        return mode;
 }
 
-#ifdef CONFIG_DM_MMC_OPS
+#ifdef CONFIG_DM_MMC
 static int dwmci_send_cmd(struct udevice *dev, struct mmc_cmd *cmd,
                   struct mmc_data *data)
 {
@@ -383,12 +383,12 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq)
        return 0;
 }
 
-#ifdef CONFIG_DM_MMC_OPS
+#ifdef CONFIG_DM_MMC
 static int dwmci_set_ios(struct udevice *dev)
 {
        struct mmc *mmc = mmc_get_mmc_dev(dev);
 #else
-static void dwmci_set_ios(struct mmc *mmc)
+static int dwmci_set_ios(struct mmc *mmc)
 {
 #endif
        struct dwmci_host *host = (struct dwmci_host *)mmc->priv;
@@ -421,9 +421,8 @@ static void dwmci_set_ios(struct mmc *mmc)
 
        if (host->clksel)
                host->clksel(host);
-#ifdef CONFIG_DM_MMC_OPS
+
        return 0;
-#endif
 }
 
 static int dwmci_init(struct mmc *mmc)
@@ -467,7 +466,7 @@ static int dwmci_init(struct mmc *mmc)
        return 0;
 }
 
-#ifdef CONFIG_DM_MMC_OPS
+#ifdef CONFIG_DM_MMC
 int dwmci_probe(struct udevice *dev)
 {
        struct mmc *mmc = mmc_get_mmc_dev(dev);
@@ -488,11 +487,11 @@ static const struct mmc_ops dwmci_ops = {
 };
 #endif
 
-void dwmci_setup_cfg(struct mmc_config *cfg, const char *name, int buswidth,
-                    uint caps, u32 max_clk, u32 min_clk)
+void dwmci_setup_cfg(struct mmc_config *cfg, struct dwmci_host *host,
+               u32 max_clk, u32 min_clk)
 {
-       cfg->name = name;
-#ifndef CONFIG_DM_MMC_OPS
+       cfg->name = host->name;
+#ifndef CONFIG_DM_MMC
        cfg->ops = &dwmci_ops;
 #endif
        cfg->f_min = min_clk;
@@ -500,9 +499,9 @@ void dwmci_setup_cfg(struct mmc_config *cfg, const char *name, int buswidth,
 
        cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
 
-       cfg->host_caps = caps;
+       cfg->host_caps = host->caps;
 
-       if (buswidth == 8) {
+       if (host->buswidth == 8) {
                cfg->host_caps |= MMC_MODE_8BIT;
                cfg->host_caps &= ~MMC_MODE_4BIT;
        } else {
@@ -522,8 +521,7 @@ int dwmci_bind(struct udevice *dev, struct mmc *mmc, struct mmc_config *cfg)
 #else
 int add_dwmci(struct dwmci_host *host, u32 max_clk, u32 min_clk)
 {
-       dwmci_setup_cfg(&host->cfg, host->name, host->buswidth, host->caps,
-                       max_clk, min_clk);
+       dwmci_setup_cfg(&host->cfg, host, max_clk, min_clk);
 
        host->mmc = mmc_create(&host->cfg, host);
        if (host->mmc == NULL)