summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/omap_hsmmc.c
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2014-11-08 20:55:47 +0100
committerTom Rini <trini@ti.com>2014-12-04 21:28:15 -0500
commitaac5450ea92abc9109a78cc099d366962148719f (patch)
tree5a0608bbad849c53e3228da83f8b667be9969a84 /drivers/mmc/omap_hsmmc.c
parentf3e85e4825e02fbd21859c35881f639a2c3e7afd (diff)
downloadtalos-obmc-uboot-aac5450ea92abc9109a78cc099d366962148719f.tar.gz
talos-obmc-uboot-aac5450ea92abc9109a78cc099d366962148719f.zip
omap_hsmmc: Board-specific TWL4030 MMC power initializations
Boards using the TWL4030 regulator may not all use the LDOs the same way (e.g. MMC2 power can be controlled by another LDO than VMMC2). This delegates TWL4030 MMC power initializations to board-specific functions, that may still call twl4030_power_mmc_init for the default behavior. Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Reviewed-by: Tom Rini <trini@ti.com> [trini: Fix omap3_evm warning, add twl4030.h] Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'drivers/mmc/omap_hsmmc.c')
-rw-r--r--drivers/mmc/omap_hsmmc.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 3303eafa85..c880cedb0a 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -135,12 +135,7 @@ static unsigned char mmc_board_init(struct mmc *mmc)
pbias_lite = readl(&t2_base->pbias_lite);
pbias_lite &= ~(PBIASLITEPWRDNZ1 | PBIASLITEPWRDNZ0);
writel(pbias_lite, &t2_base->pbias_lite);
-#endif
-#if defined(CONFIG_TWL4030_POWER)
- twl4030_power_mmc_init(0);
- twl4030_power_mmc_init(1);
-#endif
-#if defined(CONFIG_OMAP34XX)
+
writel(pbias_lite | PBIASLITEPWRDNZ1 |
PBIASSPEEDCTRL0 | PBIASLITEPWRDNZ0,
&t2_base->pbias_lite);
OpenPOWER on IntegriCloud