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

Commit 7ffd15f6 authored by Veerabhadrarao Badiganti's avatar Veerabhadrarao Badiganti
Browse files

mmc: sdhci-msm: Don't turnoff Vcc during initialization 



As per emmc specification, device should be notified either with
power-off or sleep notification before turning off the Vcc.
Failing to do so might affect the device longevity.

In mmc driver initialization phase even before device probing
gets completed, Vcc is getting turned off without these notifications.
Since it can't send commands at this stage, So just ensure that Vcc
is not turned off till initialization gets completed.

Change-Id: I0bbf0077357d66c888147be40a0c5d312b9ce063
Signed-off-by: default avatarVeerabhadrarao Badiganti <vbadigan@codeaurora.org>
parent 560a996d

drivers/mmc/host/sdhci-msm.c

+6 −17
Original line number Diff line number Diff line
@@ -2366,21 +2366,6 @@ out: 
	return ret;

}



/*

 * Reset vreg by ensuring it is off during probe. A call

 * to enable vreg is needed to balance disable vreg

 */

static int sdhci_msm_vreg_reset(struct sdhci_msm_pltfm_data *pdata)

{

	int ret;



	ret = sdhci_msm_setup_vreg(pdata, 1, true);

	if (ret)

		return ret;

	ret = sdhci_msm_setup_vreg(pdata, 0, true);

	return ret;

}



/* This init function should be called only once for each SDHC slot */

static int sdhci_msm_vreg_init(struct device *dev,

				struct sdhci_msm_pltfm_data *pdata,
@@ -2415,7 +2400,7 @@ static int sdhci_msm_vreg_init(struct device *dev, 
		if (ret)

			goto vdd_reg_deinit;

	}

	ret = sdhci_msm_vreg_reset(pdata);



	if (ret)

		dev_err(dev, "vreg reset failed (%d)\n", ret);

	goto out;
@@ -2592,7 +2577,9 @@ static irqreturn_t sdhci_msm_pwr_irq(int irq, void *data) 
		io_level = REQ_IO_HIGH;

	}

	if (irq_status & CORE_PWRCTL_BUS_OFF) {

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

		if (msm_host->pltfm_init_done)

			ret = sdhci_msm_setup_vreg(msm_host->pdata,

					false, false);

		if (!ret) {

			ret = sdhci_msm_setup_pins(msm_host->pdata, false);

			ret |= sdhci_msm_set_vdd_io_vol(msm_host->pdata,
@@ -4668,6 +4655,8 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
		goto vreg_deinit;

	}



	msm_host->pltfm_init_done = true;



	pm_runtime_set_active(&pdev->dev);

	pm_runtime_enable(&pdev->dev);

	pm_runtime_set_autosuspend_delay(&pdev->dev, MSM_AUTOSUSPEND_DELAY_MS);

drivers/mmc/host/sdhci-msm.h

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ struct sdhci_msm_host { 
	bool mci_removed;

	const struct sdhci_msm_offset *offset;

	bool core_3_0v_support;

	bool pltfm_init_done;

};



extern char *saved_command_line;