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

[karo-tx-uboot.git] / drivers / mmc / arm_pl180_mmci.c

diff --git a/drivers/mmc/arm_pl180_mmci.c b/drivers/mmc/arm_pl180_mmci.c
index db2c7ab75ce397a669937caaa8934a9601dc9788..5ef7ff7ff2b7fa584c36d64e8f9f530f43cd7425 100644 (file)
--- a/drivers/mmc/arm_pl180_mmci.c
+++ b/drivers/mmc/arm_pl180_mmci.c
@@ -7,20 +7,7 @@
  * Author: Martin Lundholm <martin.xa.lundholm@stericsson.com>
  * Ported to drivers/mmc/ by: Matt Waddel <matt.waddel@linaro.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /* #define DEBUG */
@@ -52,7 +39,7 @@ static int wait_for_command_end(struct mmc *dev, struct mmc_cmd *cmd)
                debug("CMD%d time out\n", cmd->cmdidx);
                return TIMEOUT;
        } else if ((hoststatus & SDI_STA_CCRCFAIL) &&
-                  (cmd->flags & MMC_RSP_CRC)) {
+                  (cmd->resp_type & MMC_RSP_CRC)) {
                printf("CMD%d CRC error\n", cmd->cmdidx);
                return -EILSEQ;
        }
@@ -300,9 +287,9 @@ static void host_set_ios(struct mmc *dev)
                u32 clkdiv = 0;
                u32 tmp_clock;
 
-               if (dev->clock >= dev->f_max) {
+               if (dev->clock >= dev->cfg->f_max) {
                        clkdiv = 0;
-                       dev->clock = dev->f_max;
+                       dev->clock = dev->cfg->f_max;
                } else {
                        clkdiv = (host->clock_in / dev->clock) - 2;
                }
@@ -348,6 +335,12 @@ static void host_set_ios(struct mmc *dev)
        udelay(CLK_CHANGE_DELAY);
 }
 
+static const struct mmc_ops arm_pl180_mmci_ops = {
+       .send_cmd = host_request,
+       .set_ios = host_set_ios,
+       .init = mmc_host_reset,
+};
+
 /*
  * mmc_host_init - initialize the mmc controller.
  * Set initial clock and power for mmc slot.
@@ -355,16 +348,9 @@ static void host_set_ios(struct mmc *dev)
  */
 int arm_pl180_mmci_init(struct pl180_mmc_host *host)
 {
-       struct mmc *dev;
+       struct mmc *mmc;
        u32 sdi_u32;
 
-       dev = malloc(sizeof(struct mmc));
-       if (!dev)
-               return -ENOMEM;
-
-       memset(dev, 0, sizeof(struct mmc));
-       dev->priv = host;
-
        writel(host->pwr_init, &host->base->power);
        writel(host->clkdiv_init, &host->base->clock);
        udelay(CLK_CHANGE_DELAY);
@@ -372,18 +358,24 @@ int arm_pl180_mmci_init(struct pl180_mmc_host *host)
        /* Disable mmc interrupts */
        sdi_u32 = readl(&host->base->mask0) & ~SDI_MASK0_MASK;
        writel(sdi_u32, &host->base->mask0);
-       strncpy(dev->name, host->name, sizeof(dev->name));
-       dev->send_cmd = host_request;
-       dev->set_ios = host_set_ios;
-       dev->init = mmc_host_reset;
-       dev->getcd = NULL;
-       dev->host_caps = host->caps;
-       dev->voltages = host->voltages;
-       dev->f_min = host->clock_min;
-       dev->f_max = host->clock_max;
-       dev->b_max = host->b_max;
-       mmc_register(dev);
-       debug("registered mmc interface number is:%d\n", dev->block_dev.dev);
+
+       host->cfg.name = host->name;
+       host->cfg.ops = &arm_pl180_mmci_ops;
+       /* TODO remove the duplicates */
+       host->cfg.host_caps = host->caps;
+       host->cfg.voltages = host->voltages;
+       host->cfg.f_min = host->clock_min;
+       host->cfg.f_max = host->clock_max;
+       if (host->b_max != 0)
+               host->cfg.b_max = host->b_max;
+       else
+               host->cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
+
+       mmc = mmc_create(&host->cfg, host);
+       if (mmc == NULL)
+               return -1;
+
+       debug("registered mmc interface number is:%d\n", mmc->block_dev.dev);
 
        return 0;
 }