mmc: introduce mmc_power_init

[people/ms/u-boot.git] / drivers / mmc / mmc.c

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 0312da91af7736db2ee2845cbfea7cfbdb115dd0..320413aeeda58cbc4fd347d380cd062e435bdbad 100644 (file)
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <mmc.h>
 #include <part.h>
+#include <power/regulator.h>
 #include <malloc.h>
 #include <memalign.h>
 #include <linux/list.h>
@@ -1582,6 +1583,31 @@ __weak void board_mmc_power_init(void)
 {
 }
 
+static int mmc_power_init(struct mmc *mmc)
+{
+       board_mmc_power_init();
+
+#if defined(CONFIG_DM_MMC) && defined(CONFIG_DM_REGULATOR) && \
+       !defined(CONFIG_SPL_BUILD)
+       struct udevice *vmmc_supply;
+       int ret;
+
+       ret = device_get_supply_regulator(mmc->dev, "vmmc-supply",
+                                         &vmmc_supply);
+       if (ret) {
+               puts("No vmmc supply\n");
+               return 0;
+       }
+
+       ret = regulator_set_enable(vmmc_supply, true);
+       if (ret) {
+               puts("Error enabling VMMC supply\n");
+               return ret;
+       }
+#endif
+       return 0;
+}
+
 int mmc_start_init(struct mmc *mmc)
 {
        bool no_card;
@@ -1606,7 +1632,9 @@ int mmc_start_init(struct mmc *mmc)
 #ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT
        mmc_adapter_card_type_ident();
 #endif
-       board_mmc_power_init();
+       err = mmc_power_init(mmc);
+       if (err)
+               return err;
 
 #ifdef CONFIG_DM_MMC_OPS
        /* The device has already been probed ready for use */