summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-02-02 12:37:34 -0500
committerTom Rini <trini@ti.com>2015-02-02 12:37:34 -0500
commit37ffffb98d78c46c840fa6e3c835d915c4247827 (patch)
tree9ecc87c3bdb7b3c821798fee7ef64bf73a5e597f /drivers/mmc
parentade8bc14ad419f698406b162c9c5dfeee7406b4c (diff)
parentf3b4bc458de3285a04c5f60df6372ad5ca79fa60 (diff)
downloadu-boot-imx-37ffffb98d78c46c840fa6e3c835d915c4247827.zip
u-boot-imx-37ffffb98d78c46c840fa6e3c835d915c4247827.tar.gz
u-boot-imx-37ffffb98d78c46c840fa6e3c835d915c4247827.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-ti
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/omap_hsmmc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index c880ced..dc725cb 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -134,6 +134,10 @@ static unsigned char mmc_board_init(struct mmc *mmc)
pbias_lite = readl(&t2_base->pbias_lite);
pbias_lite &= ~(PBIASLITEPWRDNZ1 | PBIASLITEPWRDNZ0);
+#ifdef CONFIG_TARGET_OMAP3_CAIRO
+ /* for cairo board, we need to set up 1.8 Volt bias level on MMC1 */
+ pbias_lite &= ~PBIASLITEVMODE0;
+#endif
writel(pbias_lite, &t2_base->pbias_lite);
writel(pbias_lite | PBIASLITEPWRDNZ1 |