diff options
author | Madhusudhan Chikkature <madhu.cr@ti.com> | 2010-10-01 16:35:25 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-10-01 16:35:25 -0700 |
commit | 07ad64b60c4d1f2bdbefa5db29ccb235596bc670 (patch) | |
tree | 572c8e17d988c3fb655c9e82804bb733959f224f /arch | |
parent | e13bb34bd9bbc01dcab9ed1b8adaa6a199ce059c (diff) | |
download | blackbird-op-linux-07ad64b60c4d1f2bdbefa5db29ccb235596bc670.tar.gz blackbird-op-linux-07ad64b60c4d1f2bdbefa5db29ccb235596bc670.zip |
OMAP4 ES2: HSMMC soft reset change
The omap4 es2 hsmmc has a updated soft reset logic.After the
reset is issued monitor a 0->1 transition first. The reset of
CMD or DATA lines is complete only after a 0->1->0 transition
of SRC or SRD bits.
Signed-off-by: Madhusudhan Chikkature <madhu.cr@ti.com>
Tested-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/hsmmc.c | 3 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/mmc.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index eb92b8107d2c..df1311d93eba 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -303,6 +303,9 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers) else mmc->slots[0].features |= HSMMC_HAS_PBIAS; + if (cpu_is_omap44xx() && (omap_rev() > OMAP4430_REV_ES1_0)) + mmc->slots[0].features |= HSMMC_HAS_UPDATED_RESET; + switch (c->mmc) { case 1: if (mmc->slots[0].features & HSMMC_HAS_PBIAS) { diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h index 4f819fc261b7..2c4629a8d9f2 100644 --- a/arch/arm/plat-omap/include/plat/mmc.h +++ b/arch/arm/plat-omap/include/plat/mmc.h @@ -103,6 +103,7 @@ struct omap_mmc_platform_data { /* we can put the features above into this variable */ #define HSMMC_HAS_PBIAS (1 << 0) +#define HSMMC_HAS_UPDATED_RESET (1 << 1) unsigned features; int switch_pin; /* gpio (card detect) */ |