diff mbox

[U-Boot,v1,4/6] omap3: mmc: add 1.8v bias setting for MMC1

Message ID 1421395793-23894-5-git-send-email-albert.aribaud@3adev.fr
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Albert ARIBAUD (3ADEV) Jan. 16, 2015, 8:09 a.m. UTC 
Signed-off-by: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr>
---

 arch/arm/include/asm/arch-omap3/mmc_host_def.h | 1 +
 drivers/mmc/omap_hsmmc.c                       | 4 ++++
 2 files changed, 5 insertions(+)

Comments

Tom Rini Jan. 30, 2015, 2:20 p.m. UTC | #1 
On Fri, Jan 16, 2015 at 09:09:50AM +0100, Albert ARIBAUD (3ADEV) wrote:

> Signed-off-by: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr>

Applied to u-boot-ti/master, thanks!
diff mbox

Patch

diff --git a/arch/arm/include/asm/arch-omap3/mmc_host_def.h b/arch/arm/include/asm/arch-omap3/mmc_host_def.h
index 0ba621a..9f2896c 100644
--- a/arch/arm/include/asm/arch-omap3/mmc_host_def.h
+++ b/arch/arm/include/asm/arch-omap3/mmc_host_def.h
@@ -51,6 +51,7 @@  typedef struct t2 {
 #define PBIASLITEPWRDNZ0		(1 << 1)
 #define PBIASSPEEDCTRL0			(1 << 2)
 #define PBIASLITEPWRDNZ1		(1 << 9)
+#define PBIASLITEVMODE0			(1 << 0)
 
 #define CTLPROGIO1SPEEDCTRL		(1 << 20)
 
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 |