summaryrefslogtreecommitdiffstats
path: root/board/samsung
diff options
context:
space:
mode:
authorJaehoon Chung <jh80.chung@samsung.com>2014-05-16 13:59:49 +0900
committerMinkyu Kang <mk7.kang@samsung.com>2014-05-16 14:54:26 +0900
commit58209dfaced619a53581c4d66d9791ce8316e0d5 (patch)
treeb85fee87c4dde29d362746535040dd0c28bd5939 /board/samsung
parentcd0ae61cc2dd02a5f9a04bb1300153438002cec3 (diff)
downloadblackbird-obmc-uboot-58209dfaced619a53581c4d66d9791ce8316e0d5.tar.gz
blackbird-obmc-uboot-58209dfaced619a53581c4d66d9791ce8316e0d5.zip
ARM: exynos: board: change the mmc/sd init sequence
Exynos4 can be used the dwmmc controller for eMMC. Then it needs to check dwmmc_init() at first. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com> Tested-by: Lukasz Majewski <l.majewski@samsung.com> Acked-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'board/samsung')
-rw-r--r--board/samsung/common/board.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index de154e0f64..9dc7c832e6 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -243,13 +243,6 @@ int board_eth_init(bd_t *bis)
int board_mmc_init(bd_t *bis)
{
int ret;
-
-#ifdef CONFIG_SDHCI
- /* mmc initializattion for available channels */
- ret = exynos_mmc_init(gd->fdt_blob);
- if (ret)
- debug("mmc init failed\n");
-#endif
#ifdef CONFIG_DWMMC
/* dwmmc initializattion for available channels */
ret = exynos_dwmmc_init(gd->fdt_blob);
@@ -257,6 +250,12 @@ int board_mmc_init(bd_t *bis)
debug("dwmmc init failed\n");
#endif
+#ifdef CONFIG_SDHCI
+ /* mmc initializattion for available channels */
+ ret = exynos_mmc_init(gd->fdt_blob);
+ if (ret)
+ debug("mmc init failed\n");
+#endif
return ret;
}
#endif
OpenPOWER on IntegriCloud