aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSundar R Iyer <sundar.iyer@stericsson.com>2010-05-31 12:02:23 +0530
committerJohn Rigby <john.rigby@linaro.org>2010-09-02 22:45:31 -0600
commitdaa48c12084ade2a9dc6341fefdc9b0c85f2dd2e (patch)
tree18935c37364762d3e963951fc8dff0e6980d9239 /arch
parent91d7edacb1a8f723723fabf8f02216e33c5865d5 (diff)
downloadlinux-2.6.34-ux500-daa48c12084ade2a9dc6341fefdc9b0c85f2dd2e.tar.gz
ux500-mmc: pass mmc operating voltage through platform
Pass the appropriate opertaing voltage required for the mmc peripheral through the platform data. This will allow the mmc driver to configure the source supply to the required voltages. Acked-By: Hanumath PRASAD <hanumath.prasad@stericsson.com> Signed-off-by: Sundar R Iyer <sundar.iyer@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/543 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com> Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Change-Id: I452d69f92ae8f713cbbcc14a3ff69f7e3ca23a78 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2384
Diffstat (limited to 'arch')
-rwxr-xr-xarch/arm/mach-ux500/include/mach/mmc.h1
-rw-r--r--arch/arm/mach-ux500/mop500-sdi.c6
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/include/mach/mmc.h b/arch/arm/mach-ux500/include/mach/mmc.h
index 115f16ea741..a3bdcc35d61 100755
--- a/arch/arm/mach-ux500/include/mach/mmc.h
+++ b/arch/arm/mach-ux500/include/mach/mmc.h
@@ -365,6 +365,7 @@ struct mmc_board {
int is_sdio; /* To check if the bus is SD/MMC or sdio */
#ifdef CONFIG_REGULATOR
const char *supply;
+ int supply_voltage;
#endif
};
diff --git a/arch/arm/mach-ux500/mop500-sdi.c b/arch/arm/mach-ux500/mop500-sdi.c
index 8a5e683821d..5370621a724 100644
--- a/arch/arm/mach-ux500/mop500-sdi.c
+++ b/arch/arm/mach-ux500/mop500-sdi.c
@@ -128,7 +128,8 @@ static struct mmc_board mmc_data = {
.caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED |
MMC_CAP_MMC_HIGHSPEED,
#ifdef CONFIG_REGULATOR
- .supply = "v-MMC-SD" /* tying to VAUX3 regulator */
+ .supply = "v-MMC-SD", /* tying to VAUX3 regulator */
+ .supply_voltage = 2900000 /* 2.9V */
#endif
};
@@ -245,7 +246,8 @@ static struct mmc_board emmc_data = {
.dma_fifo_dev_type_tx = DMA_DEV_SD_MM4_TX,
.caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA | MMC_CAP_MMC_HIGHSPEED,
#ifdef CONFIG_REGULATOR
- .supply = "v-eMMC" /* tying to VAUX1 regulator */
+ .supply = "v-eMMC", /* tying to VAUX1 regulator */
+ .supply_voltage = 2900000 /* 2.9V */
#endif
};