diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-13 08:13:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-13 08:13:56 -0400 |
| commit | c69f6d04ec66433f2360490a5cd0263c83aab18f (patch) | |
| tree | ea11b307b58f5abd066d57db87cdde43daf73c80 /drivers/mmc/mv_sdhci.c | |
| parent | 79493609c5300be6cc555ab8bd38971360b381f6 (diff) | |
| parent | 57718f017b10871cd9dc03dca56c3bd690fc2614 (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot-mmc
Diffstat (limited to 'drivers/mmc/mv_sdhci.c')
| -rw-r--r-- | drivers/mmc/mv_sdhci.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c index 82c695f906..e388ad171b 100644 --- a/drivers/mmc/mv_sdhci.c +++ b/drivers/mmc/mv_sdhci.c @@ -71,7 +71,7 @@ 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; @@ -88,9 +88,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); } |