mmc: omap_hsmmc: add mmc1 pbias, ldo1

add dra mmc pbias support and ldo1 power on

Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

6 files changed, 48 insertions, 20 deletions

diff --git a/arch/arm/include/asm/arch-omap5/omap.h b/arch/arm/include/asm/arch-omap5/omap.h
index 15d429f4f9..63378fb10c 100644
--- a/arch/arm/include/asm/arch-omap5/omap.h
+++ b/arch/arm/include/asm/arch-omap5/omap.h
@@ -96,9 +96,10 @@
 /* CONTROL_EFUSE_2 */
 #define CONTROL_EFUSE_2_NMOS_PMOS_PTV_CODE_1            0x00ffc000
 
+#define SDCARD_BIAS_PWRDNZ                              (1 << 27)
 #define SDCARD_PWRDNZ                                   (1 << 26)
 #define SDCARD_BIAS_HIZ_MODE                            (1 << 25)
-#define SDCARD_BIAS_PWRDNZ                              (1 << 22)
+#define SDCARD_BIAS_PWRDNZ2                             (1 << 22)
 #define SDCARD_PBIASLITE_VMODE                          (1 << 21)
 
 #ifndef __ASSEMBLY__
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index afdfa886e8..60807df24e 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -113,23 +113,25 @@ static void omap5_pbias_config(struct mmc *mmc)
         u32 value = 0;
 
         value = readl((*ctrl)->control_pbias);
-        value &= ~(SDCARD_PWRDNZ | SDCARD_BIAS_PWRDNZ);
-        value |= SDCARD_BIAS_HIZ_MODE;
+        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();
+#if defined(CONFIG_DRA7XX)
+        palmas_mmc1_poweron_ldo1();
+#else
+        palmas_mmc1_poweron_ldo9();
+#endif
 
         value = readl((*ctrl)->control_pbias);
-        value &= ~SDCARD_BIAS_HIZ_MODE;
-        value |= SDCARD_PBIASLITE_VMODE | SDCARD_PWRDNZ | SDCARD_BIAS_PWRDNZ;
+        value |= SDCARD_BIAS_PWRDNZ;
         writel(value, (*ctrl)->control_pbias);
-
-        value = readl((*ctrl)->control_pbias);
-        if (value & (1 << 23)) {
-                value &= ~(SDCARD_PWRDNZ | SDCARD_BIAS_PWRDNZ);
-                value |= SDCARD_BIAS_HIZ_MODE;
-                writel(value, (*ctrl)->control_pbias);
-        }
+        udelay(150); /* wait 10 us */
+        value |= SDCARD_PWRDNZ;
+        writel(value, (*ctrl)->control_pbias);
+        udelay(150); /* wait 10 us */
 }
 #endif
 
diff --git a/drivers/power/palmas.c b/drivers/power/palmas.c
index 09c832d8b6..84ec8818b6 100644
--- a/drivers/power/palmas.c
+++ b/drivers/power/palmas.c
@@ -28,7 +28,7 @@ void palmas_init_settings(void)
         return;
 }
 
-int palmas_mmc1_poweron_ldo(void)
+int palmas_mmc1_poweron_ldo9(void)
 {
         u8 val = 0;
 
@@ -50,3 +50,26 @@ int palmas_mmc1_poweron_ldo(void)
 
         return 0;
 }
+
+int palmas_mmc1_poweron_ldo1(void)
+{
+        u8 val = 0;
+
+        /* set LDO9 TWL6035 to 3V */
+        val = 0x2b; /* (3 -.9)*20 +1 */
+
+        if (palmas_i2c_write_u8(0x58, LDO1_VOLTAGE, val)) {
+                printf("twl6035: could not set LDO1 voltage\n");
+                return 1;
+        }
+
+        /* TURN ON LDO9 */
+        val = LDO_ON | LDO_MODE_SLEEP | LDO_MODE_ACTIVE;
+
+        if (palmas_i2c_write_u8(0x58, LDO1_CTRL, val)) {
+                printf("twl6035: could not turn on LDO1\n");
+                return 1;
+        }
+
+        return 0;
+}
diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h
index 9fef21c7d9..f2c4c70323 100644
--- a/include/configs/omap5_common.h
+++ b/include/configs/omap5_common.h
@@ -241,6 +241,10 @@
 #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
 #endif
 
+#ifndef CONFIG_SPL_BUILD
+#define CONFIG_PALMAS_POWER
+#endif
+
 /* Defines for SPL */
 #define CONFIG_SPL
 #define CONFIG_SPL_FRAMEWORK
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index 96c5955b62..69754c6a1c 100644
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -39,11 +39,6 @@
 #define CONFIG_SYS_NS16550_COM3         UART3_BASE
 #define CONFIG_BAUDRATE                 115200
 
-/* TWL6035 */
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_PALMAS_POWER
-#endif
-
 /* MMC ENV related defines */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV          1       /* SLOT2: eMMC(1) */
diff --git a/include/palmas.h b/include/palmas.h
index 3b185896d6..18a25ffa75 100644
--- a/include/palmas.h
+++ b/include/palmas.h
@@ -30,6 +30,8 @@
 #define PALMAS_CHIP_ADDR        0x48
 
 /* 0x1XY translates to page 1, register address 0xXY */
+#define LDO1_CTRL               0x50
+#define LDO1_VOLTAGE            0x51
 #define LDO9_CTRL               0x60
 #define LDO9_VOLTAGE            0x61
 
@@ -53,6 +55,7 @@ static inline int palmas_i2c_read_u8(u8 chip_no, u8 reg, u8 *val)
 }
 
 void palmas_init_settings(void);
-int palmas_mmc1_poweron_ldo(void);
+int palmas_mmc1_poweron_ldo9(void);
+int palmas_mmc1_poweron_ldo1(void);
 
 #endif /* PALMAS_H */