diff options
| author | Kishore Kadiyala <x0099945@svrlnx050.tif.ti.com> | 2009-11-07 01:33:40 +0100 |
|---|---|---|
| committer | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2009-11-07 02:03:23 +0100 |
| commit | 8408f329f398bd408002e074bd629bf31249183a (patch) | |
| tree | 3cf5a3cbd004476679abc1654a7cd8f24391a662 /arch/arm/mach-omap2 | |
| parent | d619923452d9fd85a03bac385a0ce36b0244ea2c (diff) | |
OMAP4: MMC: Fix pbias configuration
This patch fixes pbias configuration to support MMC1 on OMAP4 SDP.
The patch bypasses card detection. So for now, the card should be
inserted before booting the board.
Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/mmc-twl4030.c | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index 70814dde24f6..23cdc3a01111 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c @@ -259,7 +259,8 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, omap_ctrl_writel(reg, control_pbias_offset); } else { reg = omap_ctrl_readl(control_pbias_offset); - reg &= ~(1 << 20); + reg &= ~(OMAP4_MMC1_PBIASLITE_PWRDNZ | + OMAP4_MMC1_PWRDWNZ); omap_ctrl_writel(reg, control_pbias_offset); } @@ -269,7 +270,8 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, msleep(100); if (!cpu_is_omap44xx()) { reg = omap_ctrl_readl(control_pbias_offset); - reg |= (OMAP2_PBIASLITEPWRDNZ0 | OMAP2_PBIASSPEEDCTRL0); + reg |= (OMAP2_PBIASLITEPWRDNZ0 | + OMAP2_PBIASSPEEDCTRL0); if ((1 << vdd) <= MMC_VDD_165_195) reg &= ~OMAP2_PBIASLITEVMODE0; else @@ -277,11 +279,13 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, omap_ctrl_writel(reg, control_pbias_offset); } else { reg = omap_ctrl_readl(control_pbias_offset); - reg |= (1 << 20); + reg |= OMAP4_MMC1_PBIASLITE_PWRDNZ; if ((1 << vdd) <= MMC_VDD_165_195) - reg &= ~(1 << 21); + reg &= ~(OMAP4_MMC1_PBIASLITE_VMODE); else - reg |= (1 << 21); + reg |= (OMAP4_MMC1_PBIASLITE_VMODE); + reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ | + OMAP4_MMC1_PWRDWNZ); omap_ctrl_writel(reg, control_pbias_offset); } } else { @@ -291,7 +295,8 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, omap_ctrl_writel(reg, control_pbias_offset); } else { reg = omap_ctrl_readl(control_pbias_offset); - reg &= ~(1 << 20); + reg &= ~(OMAP4_MMC1_PBIASLITE_PWRDNZ | + OMAP4_MMC1_PWRDWNZ); omap_ctrl_writel(reg, control_pbias_offset); } @@ -306,7 +311,9 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, omap_ctrl_writel(reg, control_pbias_offset); } else { reg = omap_ctrl_readl(control_pbias_offset); - reg |= (1 << 20 | 1 << 21); + reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ | + OMAP4_MMC1_PBIASLITE_VMODE | + OMAP4_MMC1_PWRDWNZ); omap_ctrl_writel(reg, control_pbias_offset); } } @@ -392,10 +399,16 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) } if (cpu_is_omap44xx()) { - control_pbias_offset = 0x600; - control_mmc1 = 0x628; + control_pbias_offset = OMAP44XX_CONTROL_PBIAS_LITE; + control_mmc1 = OMAP44XX_CONTROL_MMC1; reg = omap_ctrl_readl(control_mmc1); - reg |= 0xbe000000; + reg |= (OMAP4_CONTROL_SDMMC1_PUSTRENGTHGRP0 | + OMAP4_CONTROL_SDMMC1_PUSTRENGTHGRP1); + reg &= ~(OMAP4_CONTROL_SDMMC1_PUSTRENGTHGRP2 | + OMAP4_CONTROL_SDMMC1_PUSTRENGTHGRP3); + reg |= (OMAP4_CONTROL_SDMMC1_DR0_SPEEDCTRL | + OMAP4_CONTROL_SDMMC1_DR0_SPEEDCTRL | + OMAP4_CONTROL_SDMMC1_DR0_SPEEDCTRL); omap_ctrl_writel(reg, control_mmc1); } else { control_pbias_offset = OMAP343X_CONTROL_PBIAS_LITE; |