Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "mmc: core: increase delay between power-up and power-on" 

This reverts commit 3ec1ed2a8d.

The original 10ms delay is enough to reach power on from power
up. Increase delay is workaround to resovle resume Re-init
retries time out error. The root cause is additional QDSD block
would impact SD fucntionality as they are multiplex with SD
interface. If cd-gpio is HW floating and has a pulse, QDSD 100ms
search process would be triggerred is prior to SD block and SD
interface work as QDSD instead of SD.

The fix is merged, so revert the workaround.

Change-Id: I647be754de4a6a13678cbb1456a9db88c2714f94
Signed-off-by: Guoping Yu <guopingy@codeaurora.org>
This commit is contained in:
Guoping Yu 2014-09-30 10:30:23 +08:00
parent 3ec1ed2a8d
commit 02a9497a17
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mmc/core/core.c
View File

@ -2085,10 +2085,7 @@ void mmc_power_up(struct mmc_host *host)
* This delay should be sufficient to allow the power supply
* to reach the minimum voltage.
*/
if (host->caps2 & MMC_CAP2_VDD_MORE_POWER_UP_TIME)
mmc_delay(150);
else
mmc_delay(10);
mmc_delay(10);
host->ios.clock = host->f_init;

2
include/linux/mmc/host.h
View File

@ -330,8 +330,6 @@ struct mmc_host {
#define MMC_CAP2_HS400 (MMC_CAP2_HS400_1_8V | \
MMC_CAP2_HS400_1_2V)
#define MMC_CAP2_NONHOTPLUG (1 << 25) /*Don't support hotplug*/
/*Vdd need more power up time*/
#define MMC_CAP2_VDD_MORE_POWER_UP_TIME (1 << 26)
mmc_pm_flag_t pm_caps; /* supported pm features */
int clk_requests; /* internal reference counter */