diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-10 18:28:37 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-10 18:28:37 +0200 |
| commit | 1b83470f3c2eeae398cf90831f96c8ba4ed675fa (patch) | |
| tree | 39bcf8beb8722bfe9cacbb3310cd5571f1e0b720 /drivers/mmc | |
| parent | 74ae612fd8cfeb55f663bdd565d3f9d73703b2c4 (diff) | |
| parent | 68cd4a4c9f4d7be8dc95796fb567f6b03faf9d97 (diff) | |
| download | u-boot-imx-1b83470f3c2eeae398cf90831f96c8ba4ed675fa.zip u-boot-imx-1b83470f3c2eeae398cf90831f96c8ba4ed675fa.tar.gz u-boot-imx-1b83470f3c2eeae398cf90831f96c8ba4ed675fa.tar.bz2 | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/omap_hsmmc.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index afdfa88..975b2c5 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -113,23 +113,21 @@ static void omap5_pbias_config(struct mmc *mmc) u32 value = 0; value = readl((*ctrl)->control_pbias); - value &= ~(SDCARD_PWRDNZ | SDCARD_BIAS_PWRDNZ); - value |= SDCARD_BIAS_HIZ_MODE; + value &= ~SDCARD_PWRDNZ; + writel(value, (*ctrl)->control_pbias); + udelay(10); /* wait 10 us */ + value &= ~SDCARD_BIAS_PWRDNZ; writel(value, (*ctrl)->control_pbias); palmas_mmc1_poweron_ldo(); value = readl((*ctrl)->control_pbias); - value &= ~SDCARD_BIAS_HIZ_MODE; - value |= SDCARD_PBIASLITE_VMODE | SDCARD_PWRDNZ | SDCARD_BIAS_PWRDNZ; + value |= SDCARD_BIAS_PWRDNZ; writel(value, (*ctrl)->control_pbias); - - value = readl((*ctrl)->control_pbias); - if (value & (1 << 23)) { - value &= ~(SDCARD_PWRDNZ | SDCARD_BIAS_PWRDNZ); - value |= SDCARD_BIAS_HIZ_MODE; - writel(value, (*ctrl)->control_pbias); - } + udelay(150); /* wait 150 us */ + value |= SDCARD_PWRDNZ; + writel(value, (*ctrl)->control_pbias); + udelay(150); /* wait 150 us */ } #endif |