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

Commit 6e3436ea authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 2caf9c68 02a9497a

drivers/mmc/core/core.c

+1 −4
Original line number Diff line number Diff line
@@ -2084,9 +2084,6 @@ 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);



	host->ios.clock = host->f_init;

include/linux/mmc/host.h

+0 −2
Original line number Diff line number Diff line
@@ -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 */