diff options
| author | Kishore Kadiyala <kishore.kadiyala@ti.com> | 2009-11-09 16:24:36 +0100 |
|---|---|---|
| committer | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2009-11-14 14:43:11 +0100 |
| commit | bfdd520fae66c61476264189095194cc7794ea5f (patch) | |
| tree | 1e11a8726f358a1a29c774255561c87b98cddf04 /drivers | |
| parent | ac588246715dc0d50c8507cfdf10ce4d014d42be (diff) | |
PBIAS & CARD DETECT CONFIGURATION
This patch configures pbias and card detect for MMC-1 Slot on OMAP4 SDP
Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
----------
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 3 | ||||
| -rw-r--r-- | drivers/regulator/twl-regulator.c | 14 |
2 files changed, 10 insertions, 7 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 1e9a195edc0c..30f9fea335da 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -599,6 +599,9 @@ static void mmc_omap_detect(struct work_struct *work) mmc_carddetect_work); struct omap_mmc_slot_data *slot = &mmc_slot(host); + /* Since EMMC is not hotpluggable no card detect is required */ + if (host->id == OMAP_MMC2_DEVID) + return 1; if (mmc_slot(host).card_detect) host->carddetect = slot->card_detect(slot->card_detect_irq); else diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c index 4152f2c9ae30..35cee9c424f4 100644 --- a/drivers/regulator/twl-regulator.c +++ b/drivers/regulator/twl-regulator.c @@ -472,12 +472,12 @@ static struct twlreg_info twl_regs[] = { TWL6030_ADJUSTABLE_LDO(VAUX1_6030, 0x84, 1), TWL6030_ADJUSTABLE_LDO(VAUX2_6030, 0x88, 2), TWL6030_ADJUSTABLE_LDO(VAUX3_6030, 0x8c, 3), - TWL6030_ADJUSTABLE_LDO(VMMC, 0x98, 4), - TWL6030_ADJUSTABLE_LDO(VPP, 0x9c, 5), + TWL6030_ADJUSTABLE_LDO(VMMC, 0x18, 4), + TWL6030_ADJUSTABLE_LDO(VPP, 0x1c, 5), /* TWL6030_ADJUSTABLE_LDO(VRTC, 0x00, 6), */ - TWL6030_ADJUSTABLE_LDO(VUSIM, 0xa4, 7), + TWL6030_ADJUSTABLE_LDO(VUSIM, 0x24, 7), /* SMPS TWL6030_SMPS(VDD1, 0x4b, 8), TWL6030_SMPS(VDD2, 0x55, 9), @@ -487,10 +487,10 @@ static struct twlreg_info twl_regs[] = { TWL6030_SMPS(V1V8, 0x00, 13), TWL6030_SMPS(V2V1, 0x00, 14), */ - TWL6030_FIXED_LDO(VANA, 0x80, 2100, 15), - TWL6030_FIXED_LDO(VCXIO, 0x90, 1800, 16), - TWL6030_FIXED_LDO(VDAC, 0x94, 1800, 17), - TWL6030_FIXED_LDO(VUSB, 0xa0, 3300, 18) + TWL6030_FIXED_LDO(VANA, 0x00, 2100, 15), + TWL6030_FIXED_LDO(VCXIO, 0x10, 1800, 16), + TWL6030_FIXED_LDO(VDAC, 0x14, 1800, 17), + TWL6030_FIXED_LDO(VUSB, 0x20, 3300, 18) #endif }; |