|
@@ -96,44 +96,6 @@ static int omap_mmc_setup_gpio_in(int gpio, const char *label)
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
-#if defined(CONFIG_OMAP44XX)
|
|
|
-static void omap4_vmmc_pbias_config(struct mmc *mmc)
|
|
|
-{
|
|
|
- u32 value = 0;
|
|
|
-
|
|
|
- value = readl((*ctrl)->control_pbiaslite);
|
|
|
- value &= ~(MMC1_PBIASLITE_PWRDNZ | MMC1_PWRDNZ);
|
|
|
- writel(value, (*ctrl)->control_pbiaslite);
|
|
|
- value = readl((*ctrl)->control_pbiaslite);
|
|
|
- value |= MMC1_PBIASLITE_VMODE | MMC1_PBIASLITE_PWRDNZ | MMC1_PWRDNZ;
|
|
|
- writel(value, (*ctrl)->control_pbiaslite);
|
|
|
-}
|
|
|
-#endif
|
|
|
-
|
|
|
-#if defined(CONFIG_OMAP54XX) && defined(CONFIG_PALMAS_POWER)
|
|
|
-static void omap5_pbias_config(struct mmc *mmc)
|
|
|
-{
|
|
|
- u32 value = 0;
|
|
|
-
|
|
|
- value = readl((*ctrl)->control_pbias);
|
|
|
- value &= ~SDCARD_PWRDNZ;
|
|
|
- writel(value, (*ctrl)->control_pbias);
|
|
|
- udelay(10); /* wait 10 us */
|
|
|
- value &= ~SDCARD_BIAS_PWRDNZ;
|
|
|
- writel(value, (*ctrl)->control_pbias);
|
|
|
-
|
|
|
- palmas_mmc1_poweron_ldo();
|
|
|
-
|
|
|
- value = readl((*ctrl)->control_pbias);
|
|
|
- value |= SDCARD_BIAS_PWRDNZ;
|
|
|
- writel(value, (*ctrl)->control_pbias);
|
|
|
- udelay(150); /* wait 150 us */
|
|
|
- value |= SDCARD_PWRDNZ;
|
|
|
- writel(value, (*ctrl)->control_pbias);
|
|
|
- udelay(150); /* wait 150 us */
|
|
|
-}
|
|
|
-#endif
|
|
|
-
|
|
|
static unsigned char mmc_board_init(struct mmc *mmc)
|
|
|
{
|
|
|
#if defined(CONFIG_OMAP34XX)
|
|
@@ -173,14 +135,10 @@ static unsigned char mmc_board_init(struct mmc *mmc)
|
|
|
&prcm_base->iclken1_core);
|
|
|
#endif
|
|
|
|
|
|
-#if defined(CONFIG_OMAP44XX)
|
|
|
+#if defined(CONFIG_OMAP54XX) || defined(CONFIG_OMAP44XX)
|
|
|
/* PBIAS config needed for MMC1 only */
|
|
|
if (mmc->block_dev.devnum == 0)
|
|
|
- omap4_vmmc_pbias_config(mmc);
|
|
|
-#endif
|
|
|
-#if defined(CONFIG_OMAP54XX) && defined(CONFIG_PALMAS_POWER)
|
|
|
- if (mmc->block_dev.devnum == 0)
|
|
|
- omap5_pbias_config(mmc);
|
|
|
+ vmmc_pbias_config(LDO_VOLT_3V0);
|
|
|
#endif
|
|
|
|
|
|
return 0;
|
|
@@ -214,7 +172,6 @@ void mmc_init_stream(struct hsmmc *mmc_base)
|
|
|
writel(readl(&mmc_base->con) & ~INIT_INITSTREAM, &mmc_base->con);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
static int omap_hsmmc_init_setup(struct mmc *mmc)
|
|
|
{
|
|
|
struct hsmmc *mmc_base;
|