Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

omap: hsmmc: fix the hsmmc driver for am3517

Browse source 
AM3517 don't have the register OMAP343X_CONTROL_PBIAS_LITE and the regulators
like "vmmc", so we set a noop "set_power" function for it.

Signed-off-by: Stanley.Miao <stanley.miao@windriver.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
stanley.miao 2010-05-13 12:39:31 +00:00 committed by Tony Lindgren
parent ed8303fc11
commit 03e7e170d6
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
arch/arm/mach-omap2/hsmmc.c
View file

@ -139,6 +139,12 @@ static void hsmmc23_before_set_reg(struct device *dev, int slot,
} }
} }
static int nop_mmc_set_power(struct device *dev, int slot, int power_on,
int vdd)
{
return 0;
}
static struct omap_mmc_platform_data *hsmmc_data[OMAP34XX_NR_MMC] __initdata; static struct omap_mmc_platform_data *hsmmc_data[OMAP34XX_NR_MMC] __initdata;
void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers) void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)
@ -216,11 +222,18 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)
*/ */
mmc->slots[0].ocr_mask = c->ocr_mask; mmc->slots[0].ocr_mask = c->ocr_mask;
if (cpu_is_omap3517() || cpu_is_omap3505())
mmc->slots[0].set_power = nop_mmc_set_power;
else
mmc->slots[0].features |= HSMMC_HAS_PBIAS;
switch (c->mmc) { switch (c->mmc) {
case 1: case 1:
/* on-chip level shifting via PBIAS0/PBIAS1 */ if (mmc->slots[0].features & HSMMC_HAS_PBIAS) {
mmc->slots[0].before_set_reg = hsmmc1_before_set_reg; /* on-chip level shifting via PBIAS0/PBIAS1 */
mmc->slots[0].after_set_reg = hsmmc1_after_set_reg; mmc->slots[0].before_set_reg = hsmmc1_before_set_reg;
mmc->slots[0].after_set_reg = hsmmc1_after_set_reg;
}
/* Omap3630 HSMMC1 supports only 4-bit */ /* Omap3630 HSMMC1 supports only 4-bit */
if (cpu_is_omap3630() && c->wires > 4) { if (cpu_is_omap3630() && c->wires > 4) {
@ -235,9 +248,11 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)
c->wires = 4; c->wires = 4;
/* FALLTHROUGH */ /* FALLTHROUGH */
case 3: case 3:
/* off-chip level shifting, or none */ if (mmc->slots[0].features & HSMMC_HAS_PBIAS) {
mmc->slots[0].before_set_reg = hsmmc23_before_set_reg; /* off-chip level shifting, or none */
mmc->slots[0].after_set_reg = NULL; mmc->slots[0].before_set_reg = hsmmc23_before_set_reg;
mmc->slots[0].after_set_reg = NULL;
}
break; break;
default: default:
pr_err("MMC%d configuration not supported!\n", c->mmc); pr_err("MMC%d configuration not supported!\n", c->mmc);

4
arch/arm/plat-omap/include/plat/mmc.h
View file

@ -102,6 +102,10 @@ struct omap_mmc_platform_data {
/* Regulator off remapped to sleep */ /* Regulator off remapped to sleep */
unsigned vcc_aux_disable_is_sleep:1; unsigned vcc_aux_disable_is_sleep:1;
/* we can put the features above into this variable */
#define HSMMC_HAS_PBIAS (1 << 0)
unsigned features;
int switch_pin; /* gpio (card detect) */ int switch_pin; /* gpio (card detect) */
int gpio_wp; /* gpio (write protect) */ int gpio_wp; /* gpio (write protect) */