summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-01-30 12:24:32 -0500
committerTom Rini <trini@konsulko.com>2019-01-30 12:24:32 -0500
commit552452f80caf1e1069e547b6605987427e93111b (patch)
tree2411445059fb8750ad6439be089399840cc3ba95 /board
parent748ad078eefea2ee5a3c8e53ca46e9e93c2fc7f1 (diff)
parenta7cca5793774ee139b75a704d6efaa4d29f09f93 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
- Enable DM_MMC support
Diffstat (limited to 'board')
-rw-r--r--board/sunxi/board.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index ad14837291..98bc3cd0c1 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -208,6 +208,10 @@ enum env_location env_get_location(enum env_operation op, int prio)
}
#endif
+#ifdef CONFIG_DM_MMC
+static void mmc_pinmux_setup(int sdc);
+#endif
+
/* add board specific code here */
int board_init(void)
{
@@ -269,6 +273,17 @@ int board_init(void)
i2c_init_board();
#endif
+#ifdef CONFIG_DM_MMC
+ /*
+ * Temporary workaround for enabling MMC clocks until a sunxi DM
+ * pinctrl driver lands.
+ */
+ mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT);
+#if CONFIG_MMC_SUNXI_SLOT_EXTRA != -1
+ mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT_EXTRA);
+#endif
+#endif /* CONFIG_DM_MMC */
+
/* Uses dm gpio code so do this here and not in i2c_init_board() */
return soft_i2c_board_init();
}