diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-05 07:46:45 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-05 07:46:45 -0500 |
| commit | 60b25259a5540686add02cf6c94cd7494a3e2d23 (patch) | |
| tree | abccf513238a9bab314b4672858512801da85580 /drivers/mmc | |
| parent | 1674942ad777bc1ae26fe93684836dcd8820f47f (diff) | |
| parent | 58cb44cf6623faeebd9b04ac44cf11d2eb39ea36 (diff) | |
| download | u-boot-imx-60b25259a5540686add02cf6c94cd7494a3e2d23.zip u-boot-imx-60b25259a5540686add02cf6c94cd7494a3e2d23.tar.gz u-boot-imx-60b25259a5540686add02cf6c94cd7494a3e2d23.tar.bz2 | |
Merge git://git.denx.de/u-boot-samsung
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/s5p_sdhci.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c index 15ecfee..44353c7 100644 --- a/drivers/mmc/s5p_sdhci.c +++ b/drivers/mmc/s5p_sdhci.c @@ -106,6 +106,12 @@ static int do_sdhci_init(struct sdhci_host *host) flag = host->bus_width == 8 ? PINMUX_FLAG_8BIT_MODE : PINMUX_FLAG_NONE; dev_id = host->index + PERIPH_ID_SDMMC0; + ret = exynos_pinmux_config(dev_id, flag); + if (ret) { + printf("external SD not configured\n"); + return ret; + } + if (dm_gpio_is_valid(&host->pwr_gpio)) { dm_gpio_set_value(&host->pwr_gpio, 1); ret = exynos_pinmux_config(dev_id, flag); @@ -121,12 +127,6 @@ static int do_sdhci_init(struct sdhci_host *host) debug("no SD card detected (%d)\n", ret); return -ENODEV; } - - ret = exynos_pinmux_config(dev_id, flag); - if (ret) { - printf("external SD not configured\n"); - return ret; - } } return s5p_sdhci_core_init(host); @@ -193,7 +193,7 @@ static int process_nodes(const void *blob, int node_list[], int count) } ret = do_sdhci_init(host); - if (ret) { + if (ret && ret != -ENODEV) { printf("%s: failed to initialize dev %d (%d)\n", __func__, i, ret); failed++; } |