Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

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

diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
old mode 100755 (executable)
new mode 100644 (file)
index 4cec5aa..5bf36a0
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -107,7 +107,7 @@ static int dwmci_set_transfer_mode(struct dwmci_host *host,
 static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
                struct mmc_data *data)
 {
-       struct dwmci_host *host = (struct dwmci_host *)mmc->priv;
+       struct dwmci_host *host = mmc->priv;
        ALLOC_CACHE_ALIGN_BUFFER(struct dwmci_idmac, cur_idmac,
                                 data ? DIV_ROUND_UP(data->blocks, 8) : 0);
        int flags = 0, i;
@@ -237,7 +237,7 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq)
         * host->bus_hz should be set from user.
         */
        if (host->get_mmc_clk)
-               sclk = host->get_mmc_clk(host->dev_index);
+               sclk = host->get_mmc_clk(host);
        else if (host->bus_hz)
                sclk = host->bus_hz;
        else {
@@ -285,7 +285,7 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq)
 static void dwmci_set_ios(struct mmc *mmc)
 {
        struct dwmci_host *host = (struct dwmci_host *)mmc->priv;
-       u32 ctype;
+       u32 ctype, regs;
 
        debug("Buswidth = %d, clock: %d\n",mmc->bus_width, mmc->clock);
 
@@ -304,13 +304,21 @@ static void dwmci_set_ios(struct mmc *mmc)
 
        dwmci_writel(host, DWMCI_CTYPE, ctype);
 
+       regs = dwmci_readl(host, DWMCI_UHS_REG);
+       if (mmc->card_caps & MMC_MODE_DDR_52MHz)
+               regs |= DWMCI_DDR_MODE;
+       else
+               regs &= DWMCI_DDR_MODE;
+
+       dwmci_writel(host, DWMCI_UHS_REG, regs);
+
        if (host->clksel)
                host->clksel(host);
 }
 
 static int dwmci_init(struct mmc *mmc)
 {
-       struct dwmci_host *host = (struct dwmci_host *)mmc->priv;
+       struct dwmci_host *host = mmc->priv;
 
        if (host->board_init)
                host->board_init(host);
@@ -323,7 +331,7 @@ static int dwmci_init(struct mmc *mmc)
        }
 
        /* Enumerate at 400KHz */
-       dwmci_setup_bus(host, mmc->f_min);
+       dwmci_setup_bus(host, mmc->cfg->f_min);
 
        dwmci_writel(host, DWMCI_RINTSTS, 0xFFFFFFFF);
        dwmci_writel(host, DWMCI_INTMASK, 0);
@@ -343,41 +351,37 @@ static int dwmci_init(struct mmc *mmc)
        return 0;
 }
 
+static const struct mmc_ops dwmci_ops = {
+       .send_cmd       = dwmci_send_cmd,
+       .set_ios        = dwmci_set_ios,
+       .init           = dwmci_init,
+};
+
 int add_dwmci(struct dwmci_host *host, u32 max_clk, u32 min_clk)
 {
-       struct mmc *mmc;
-       int err = 0;
-
-       mmc = calloc(sizeof(struct mmc), 1);
-       if (!mmc) {
-               printf("mmc calloc fail!\n");
-               return -1;
-       }
-
-       mmc->priv = host;
-       host->mmc = mmc;
-
-       sprintf(mmc->name, "%s", host->name);
-       mmc->send_cmd = dwmci_send_cmd;
-       mmc->set_ios = dwmci_set_ios;
-       mmc->init = dwmci_init;
-       mmc->f_min = min_clk;
-       mmc->f_max = max_clk;
+       host->cfg.name = host->name;
+       host->cfg.ops = &dwmci_ops;
+       host->cfg.f_min = min_clk;
+       host->cfg.f_max = max_clk;
 
-       mmc->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
+       host->cfg.voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
 
-       mmc->host_caps = host->caps;
+       host->cfg.host_caps = host->caps;
 
        if (host->buswidth == 8) {
-               mmc->host_caps |= MMC_MODE_8BIT;
-               mmc->host_caps &= ~MMC_MODE_4BIT;
+               host->cfg.host_caps |= MMC_MODE_8BIT;
+               host->cfg.host_caps &= ~MMC_MODE_4BIT;
        } else {
-               mmc->host_caps |= MMC_MODE_4BIT;
-               mmc->host_caps &= ~MMC_MODE_8BIT;
+               host->cfg.host_caps |= MMC_MODE_4BIT;
+               host->cfg.host_caps &= ~MMC_MODE_8BIT;
        }
-       mmc->host_caps |= MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_HC;
+       host->cfg.host_caps |= MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_HC;
 
-       err = mmc_register(mmc);
+       host->cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
 
-       return err;
+       host->mmc = mmc_create(&host->cfg, host);
+       if (host->mmc == NULL)
+               return -1;
+
+       return 0;
 }