Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b29ed32 authored by Bao D. Nguyen's avatar Bao D. Nguyen
Browse files

Revert "mmc: sdhci-msm: Avoid enable SD card power if card is removed" 



This reverts commit 82fc4015.
When there is no SD card inserted, this change causes the SD
card driver to wait for the mmc power IRQ that never comes.
As a result, the boot up time may be longer.
Revert this change and fix the original issue properly.

Change-Id: I22b53109c10c3f533ebe1f19f9bed9301810fb77
Signed-off-by: default avatarBao D. Nguyen <nguyenb@codeaurora.org>
parent 6dfa423a

drivers/mmc/host/sdhci-msm.c

+0 −7
Original line number Diff line number Diff line
@@ -2058,7 +2058,6 @@ static void sdhci_msm_handle_pwr_irq(struct sdhci_host *host, int irq) 
	u32 config;

	const struct sdhci_msm_offset *msm_offset = msm_host->offset;

	int ret = 0;

	struct mmc_host *mmc = host->mmc;



	irq_status = msm_host_readl(msm_host, host,

			msm_offset->core_pwrctl_status);
@@ -2089,12 +2088,6 @@ static void sdhci_msm_handle_pwr_irq(struct sdhci_host *host, int irq) 
		udelay(10);

	}



	if (mmc->ops->get_cd && !mmc->ops->get_cd(mmc) &&

		irq_status & (CORE_PWRCTL_BUS_ON | CORE_PWRCTL_IO_HIGH |

			CORE_PWRCTL_IO_LOW)) {

		return;

	}



	/* Handle BUS ON/OFF*/

	if (irq_status & CORE_PWRCTL_BUS_ON) {

		ret = sdhci_msm_setup_vreg(msm_host->pdata, true, false);