ddr: altera: silence PHY calibration unless in debug mode

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

diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
index 82c695f906079a0a1a568b29d223f0b7bb8b51fc..69aa87babe13089057454d8e9c655cc8eb2d93db 100644 (file)
--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
@@ -71,12 +71,13 @@ int mv_sdh_init(unsigned long regbase, u32 max_clk, u32 min_clk, u32 quirks)
        host = (struct sdhci_host *)malloc(sizeof(struct sdhci_host));
        if (!host) {
                printf("sdh_host malloc fail!\n");
-               return 1;
+               return -ENOMEM;
        }
 
        host->name = MVSDH_NAME;
        host->ioaddr = (void *)regbase;
        host->quirks = quirks;
+       host->max_clk = max_clk;
 #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
        memset(&mv_ops, 0, sizeof(struct sdhci_ops));
        mv_ops.write_b = mv_sdhci_writeb;
@@ -88,9 +89,5 @@ int mv_sdh_init(unsigned long regbase, u32 max_clk, u32 min_clk, u32 quirks)
                sdhci_mvebu_mbus_config((void __iomem *)regbase);
        }
 
-       if (quirks & SDHCI_QUIRK_REG32_RW)
-               host->version = sdhci_readl(host, SDHCI_HOST_VERSION - 2) >> 16;
-       else
-               host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
-       return add_sdhci(host, max_clk, min_clk);
+       return add_sdhci(host, 0, min_clk);
 }