Merge git://git.denx.de/u-boot-sunxi

[u-boot] / drivers / mmc / arm_pl180_mmci.c

diff --git a/drivers/mmc/arm_pl180_mmci.c b/drivers/mmc/arm_pl180_mmci.c
index b3c1f0ddcb938351290c143c3d04e31bc0e185bb..e267cd782e8b1f4d5e9f144ebe6f2a3636c0bde9 100644 (file)
--- a/drivers/mmc/arm_pl180_mmci.c
+++ b/drivers/mmc/arm_pl180_mmci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * ARM PrimeCell MultiMedia Card Interface - PL180
  *
@@ -6,25 +7,23 @@
  * Author: Ulf Hansson <ulf.hansson@stericsson.com>
  * Author: Martin Lundholm <martin.xa.lundholm@stericsson.com>
  * Ported to drivers/mmc/ by: Matt Waddel <matt.waddel@linaro.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /* #define DEBUG */
 
 #include "common.h"
+#include <clk.h>
 #include <errno.h>
 #include <malloc.h>
 #include <mmc.h>
 
-#include "arm_pl180_mmci.h"
-
 #include <asm/io.h>
+#include <asm-generic/gpio.h>
+
+#include "arm_pl180_mmci.h"
 
 #ifdef CONFIG_DM_MMC
 #include <dm.h>
-DECLARE_GLOBAL_DATA_PTR;
-
 #define MMC_CLOCK_MAX  48000000
 #define MMC_CLOCK_MIN  400000
 
@@ -408,19 +407,48 @@ static int arm_pl180_mmc_probe(struct udevice *dev)
        struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
        struct mmc *mmc = &pdata->mmc;
        struct pl180_mmc_host *host = mmc->priv;
+       struct clk clk;
+       u32 bus_width;
        int ret;
 
+       ret = clk_get_by_index(dev, 0, &clk);
+       if (ret < 0)
+               return ret;
+
+       ret = clk_enable(&clk);
+       if (ret) {
+               dev_err(dev, "failed to enable clock\n");
+               return ret;
+       }
+
        strcpy(host->name, "MMC");
        host->pwr_init = INIT_PWR;
        host->clkdiv_init = SDI_CLKCR_CLKDIV_INIT_V1 | SDI_CLKCR_CLKEN |
                            SDI_CLKCR_HWFC_EN;
        host->voltages = VOLTAGE_WINDOW_SD;
        host->caps = 0;
-       host->clock_in = MMC_CLOCK_MAX;
-       host->clock_min = MMC_CLOCK_MIN;
+       host->clock_in = clk_get_rate(&clk);
+       host->clock_min = host->clock_in / (2 * (SDI_CLKCR_CLKDIV_INIT_V1 + 1));
        host->clock_max = dev_read_u32_default(dev, "max-frequency",
                                               MMC_CLOCK_MAX);
        host->version2 = dev_get_driver_data(dev);
+
+       gpio_request_by_name(dev, "cd-gpios", 0, &host->cd_gpio, GPIOD_IS_IN);
+
+       bus_width = dev_read_u32_default(dev, "bus-width", 1);
+       switch (bus_width) {
+       case 8:
+               host->caps |= MMC_MODE_8BIT;
+               /* Hosts capable of 8-bit transfers can also do 4 bits */
+       case 4:
+               host->caps |= MMC_MODE_4BIT;
+               break;
+       case 1:
+               break;
+       default:
+               dev_err(dev, "Invalid bus-width value %u\n", bus_width);
+       }
+
        ret = arm_pl180_mmci_init(host, &mmc);
        if (ret) {
                dev_err(dev, "arm_pl180_mmci init failed\n");
@@ -449,9 +477,26 @@ static int dm_host_set_ios(struct udevice *dev)
        return host_set_ios(mmc);
 }
 
+static int dm_mmc_getcd(struct udevice *dev)
+{
+       struct arm_pl180_mmc_plat *pdata = dev_get_platdata(dev);
+       struct mmc *mmc = &pdata->mmc;
+       struct pl180_mmc_host *host = mmc->priv;
+       int value = 1;
+
+       if (dm_gpio_is_valid(&host->cd_gpio)) {
+               value = dm_gpio_get_value(&host->cd_gpio);
+               if (host->cd_inverted)
+                       return !value;
+       }
+
+       return value;
+}
+
 static const struct dm_mmc_ops arm_pl180_dm_mmc_ops = {
        .send_cmd = dm_host_request,
        .set_ios = dm_host_set_ios,
+       .get_cd = dm_mmc_getcd,
 };
 
 static int arm_pl180_mmc_ofdata_to_platdata(struct udevice *dev)