mmc: sdhci: combine the Host controller v3.0 feature into one condition

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

diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c
index d8f8087b680711cf9ae36cd79d7316bcff2b04c7..6654b542788e6eec57da661311b6c7cc91f15598 100644 (file)
--- a/drivers/mmc/atmel_sdhci.c
+++ b/drivers/mmc/atmel_sdhci.c
@@ -29,7 +29,6 @@ int atmel_sdhci_init(void *regbase, u32 id)
        host->name = "atmel_sdhci";
        host->ioaddr = regbase;
        host->quirks = 0;
-       host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
        max_clk = at91_get_periph_generated_clk(id);
        if (!max_clk) {
                printf("%s: Failed to get the proper clock\n", __func__);
@@ -51,29 +50,6 @@ struct atmel_sdhci_plat {
        struct mmc mmc;
 };
 
-static int atmel_sdhci_get_clk(struct udevice *dev, int index, struct clk *clk)
-{
-       struct udevice *dev_clk;
-       int periph, ret;
-
-       ret = clk_get_by_index(dev, index, clk);
-       if (ret)
-               return ret;
-
-       periph = fdtdec_get_uint(gd->fdt_blob, clk->dev->of_offset, "reg", -1);
-       if (periph < 0)
-               return -EINVAL;
-
-       dev_clk = dev_get_parent(clk->dev);
-       ret = clk_request(dev_clk, clk);
-       if (ret)
-               return ret;
-
-       clk->id = periph;
-
-       return 0;
-}
-
 static int atmel_sdhci_probe(struct udevice *dev)
 {
        struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
@@ -86,7 +62,7 @@ static int atmel_sdhci_probe(struct udevice *dev)
        struct clk clk;
        int ret;
 
-       ret = atmel_sdhci_get_clk(dev, 0, &clk);
+       ret = clk_get_by_index(dev, 0, &clk);
        if (ret)
                return ret;
 
@@ -107,7 +83,7 @@ static int atmel_sdhci_probe(struct udevice *dev)
        clk_mul = (caps_1 & SDHCI_CLOCK_MUL_MASK) >> SDHCI_CLOCK_MUL_SHIFT;
        gck_rate = clk_base * 1000000 * (clk_mul + 1);
 
-       ret = atmel_sdhci_get_clk(dev, 1, &clk);
+       ret = clk_get_by_index(dev, 1, &clk);
        if (ret)
                return ret;