From 3791b965b713dd445253474a045c997b586ed80b Mon Sep 17 00:00:00 2001 From: Carlos Eduardo Aguiar Date: Thu, 13 Sep 2007 11:02:14 -0400 Subject: [PATCH] MMC: OMAP: Using correct MMC_VDD flags of low-voltage cards. Using correct MMC_VDD flags of low-voltage cards, according with commit 55556da01284af8c2174b786b3eca8e11301b656. Signed-off-by: Carlos Eduardo Aguiar Signed-off-by: Philip Langdale Using correct MMC_VDD flags of low-voltage cards, according with commit 55556da01284af8c2174b786b3eca8e11301b656. Signed-off-by: Carlos Eduardo Aguiar Signed-off-by: Philip Langdale Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/board-n800-mmc.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-omap2/board-n800-mmc.c b/arch/arm/mach-omap2/board-n800-mmc.c index b0bdd97ea53..b87c1218219 100644 --- a/arch/arm/mach-omap2/board-n800-mmc.c +++ b/arch/arm/mach-omap2/board-n800-mmc.c @@ -64,7 +64,7 @@ static int n800_mmc_set_power(struct device *dev, int slot, int power_on, case MMC_VDD_28_29: mV = 2800; break; - case MMC_VDD_18_19: + case MMC_VDD_165_195: mV = 1850; break; default: @@ -96,17 +96,11 @@ static int n800_mmc_set_power(struct device *dev, int slot, int power_on, mV = 2200; break; case MMC_VDD_20_21: - case MMC_VDD_19_20: mV = 2000; break; - case MMC_VDD_18_19: - case MMC_VDD_17_18: + case MMC_VDD_165_195: mV = 1800; break; - case MMC_VDD_150_155: - case MMC_VDD_145_150: - mV = 1500; - break; default: BUG(); } @@ -235,7 +229,8 @@ static struct omap_mmc_platform_data n800_mmc_data = { .set_bus_mode = n800_mmc_set_bus_mode, .get_ro = NULL, .get_cover_state= n800_mmc_get_cover_state, - .ocr_mask = MMC_VDD_18_19 | MMC_VDD_28_29 | MMC_VDD_30_31 | + .ocr_mask = MMC_VDD_165_195 | + MMC_VDD_28_29 | MMC_VDD_30_31 | MMC_VDD_32_33 | MMC_VDD_33_34, .name = "internal", }, @@ -244,8 +239,7 @@ static struct omap_mmc_platform_data n800_mmc_data = { .set_bus_mode = n800_mmc_set_bus_mode, .get_ro = NULL, .get_cover_state= n800_mmc_get_cover_state, - .ocr_mask = MMC_VDD_150_155 | MMC_VDD_145_150 | MMC_VDD_17_18 | - MMC_VDD_18_19 | MMC_VDD_19_20 | MMC_VDD_20_21 | + .ocr_mask = MMC_VDD_165_195 | MMC_VDD_20_21 | MMC_VDD_21_22 | MMC_VDD_22_23 | MMC_VDD_23_24 | MMC_VDD_24_25 | MMC_VDD_27_28 | MMC_VDD_28_29 | MMC_VDD_29_30 | MMC_VDD_30_31 | MMC_VDD_32_33 | -- 2.41.1