Merge "mmc: sdhci: Turn on controller clocks and card power at MMC_POWER_UP" (1e5e7d0f) · Commits · e / devices / android_kernel_sony_msm8994

drivers/mmc/host/sdhci.c

+30 −4

Original line number	Diff line number	Diff line
		@@ -1783,6 +1783,7 @@ static void sdhci_do_set_ios(struct sdhci_host host, struct mmc_ios ios)
		unsigned long flags;
		int vdd_bit = -1;
		u8 ctrl;
		int ret;

		mutex_lock(&host->ios_mutex);
		if (host->flags & SDHCI_DEVICE_DEAD) {
		@@ -1812,6 +1813,29 @@ static void sdhci_do_set_ios(struct sdhci_host host, struct mmc_ios ios)
		mmc_hostname(host->mmc), __func__);
		}
		}
		/*
		* The controller clocks may be off during power-up and we may end up
		* enabling card clock before giving power to the card. Hence, during
		* MMC_POWER_UP enable the controller clock and turn-on the regulators.
		* The mmc_power_up would provide the necessary delay before turning on
		* the clocks to the card.
		*/
		if (ios->power_mode & MMC_POWER_UP) {
		if (host->ops->enable_controller_clock) {
		ret = host->ops->enable_controller_clock(host);
		if (ret) {
		pr_err("%s: enabling controller clock: failed: %d\n",
		mmc_hostname(host->mmc), ret);
		} else {
		vdd_bit = sdhci_set_power(host, ios->vdd);

		if (host->vmmc && vdd_bit != -1)
		mmc_regulator_set_ocr(host->mmc,
		host->vmmc,
		vdd_bit);
		}
		}
		}
		spin_lock_irqsave(&host->lock, flags);
		if (!host->clock) {
		sdhci_cfg_irq(host, true);
		@@ -1825,14 +1849,16 @@ static void sdhci_do_set_ios(struct sdhci_host host, struct mmc_ios ios)
		(ios->power_mode == MMC_POWER_UP))
		sdhci_enable_preset_value(host, false);

		if (ios->power_mode & (MMC_POWER_UP \| MMC_POWER_ON))
		if (!host->ops->enable_controller_clock && (ios->power_mode &
		(MMC_POWER_UP \|
		MMC_POWER_ON))) {
		vdd_bit = sdhci_set_power(host, ios->vdd);

		if (host->vmmc && vdd_bit != -1)
		mmc_regulator_set_ocr(host->mmc, host->vmmc, vdd_bit);
		}

		spin_lock_irqsave(&host->lock, flags);

		if (host->ops->platform_send_init_74_clocks)
		host->ops->platform_send_init_74_clocks(host, ios->power_mode);

drivers/mmc/host/sdhci.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -320,6 +320,7 @@ struct sdhci_ops {
		int (config_auto_tuning_cmd)(struct sdhci_host host,
		bool enable,
		u32 type);
		int (enable_controller_clock)(struct sdhci_host host);
		};

		#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS