mmc: fsl_esdhc: Add adapter card type identification support

[karo-tx-uboot.git] / drivers / mmc / mmc.c

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 65efff28dbacae6d82ddc42dec81c2a27975c77c..63d15d47690705396b58f3584ff873656ed633a9 100644 (file)
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1593,6 +1593,9 @@ int mmc_start_init(struct mmc *mmc)
        if (mmc->has_init)
                return 0;
 
+#ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT
+       mmc_adapter_card_type_ident();
+#endif
        board_mmc_power_init();
 
        /* made sure it's not NULL earlier */
@@ -1749,6 +1752,9 @@ static void do_preinit(void)
        list_for_each(entry, &mmc_devices) {
                m = list_entry(entry, struct mmc, link);
 
+#ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT
+               mmc_set_preinit(m, 1);
+#endif
                if (m->preinit)
                        mmc_start_init(m);
        }