diff options
Diffstat (limited to 'arch/arm/mach-omap2/hsmmc.c')
| -rw-r--r-- | arch/arm/mach-omap2/hsmmc.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index 66868c5..0201705 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -31,16 +31,6 @@ static u16 control_mmc1; #define HSMMC_NAME_LEN 9 -#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM) - -static int hsmmc_get_context_loss(struct device *dev) -{ - return omap_pm_get_dev_context_loss_count(dev); -} - -#else -#define hsmmc_get_context_loss NULL -#endif static void omap_hsmmc1_before_set_reg(struct device *dev, int slot, int power_on, int vdd) @@ -318,8 +308,6 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c, else mmc->reg_offset = 0; - mmc->get_context_loss_count = hsmmc_get_context_loss; - mmc->slots[0].switch_pin = c->gpio_cd; mmc->slots[0].gpio_wp = c->gpio_wp; @@ -344,6 +332,20 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c, if (c->vcc_aux_disable_is_sleep) mmc->slots[0].vcc_aux_disable_is_sleep = 1; + if (cpu_is_omap44xx()) { + if (omap_rev() > OMAP4430_REV_ES1_0) + mmc->slots[0].features |= HSMMC_HAS_UPDATED_RESET; + if (c->mmc >= 3 && c->mmc <= 5) + mmc->slots[0].features |= HSMMC_HAS_48MHZ_MASTER_CLK; + } + + if (c->mmc_data) { + memcpy(&mmc->slots[0].mmc_data, c->mmc_data, + sizeof(struct mmc_platform_data)); + mmc->slots[0].card_detect = + (mmc_card_detect_func)c->mmc_data->status; + } + /* * NOTE: MMC slots should have a Vcc regulator set up. * This may be from a TWL4030-family chip, another |