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

Commit 261bbd46 authored by Philip Rakity's avatar Philip Rakity Committed by Chris Ball
Browse files

mmc: core: eMMC signal voltage does not use CMD11 



eMMC chips do not use CMD11 when changing voltage.  Add extra
argument to call to indicate if CMD11 needs to be sent.

Signed-off-by: default avatarPhilip Rakity <prakity@marvell.com>
Reviewed-by: default avatarArindam Nath <arindam.nath@amd.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 756515c6

drivers/mmc/core/core.c

+2 −2
Original line number Diff line number Diff line
@@ -942,7 +942,7 @@ u32 mmc_select_voltage(struct mmc_host *host, u32 ocr) 
	return ocr;

}



int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage)

int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage, bool cmd11)

{

	struct mmc_command cmd = {0};

	int err = 0;
@@ -953,7 +953,7 @@ int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage) 
	 * Send CMD11 only if the request is to switch the card to

	 * 1.8V signalling.

	 */

	if (signal_voltage == MMC_SIGNAL_VOLTAGE_180) {

	if ((signal_voltage != MMC_SIGNAL_VOLTAGE_330) && cmd11) {

		cmd.opcode = SD_SWITCH_VOLTAGE;

		cmd.arg = 0;

		cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;

drivers/mmc/core/core.h

+2 −1
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ void mmc_set_bus_width(struct mmc_host *host, unsigned int width); 
void mmc_set_bus_width_ddr(struct mmc_host *host, unsigned int width,

			   unsigned int ddr);

u32 mmc_select_voltage(struct mmc_host *host, u32 ocr);

int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage);

int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage,

			   bool cmd11);

void mmc_set_timing(struct mmc_host *host, unsigned int timing);

void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type);

drivers/mmc/core/sd.c

+2 −2
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr) 
	 */

	if (!mmc_host_is_spi(host) && rocr &&

	   ((*rocr & 0x41000000) == 0x41000000)) {

		err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180);

		err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180, true);

		if (err) {

			ocr &= ~SD_OCR_S18R;

			goto try_again;
@@ -1098,7 +1098,7 @@ int mmc_attach_sd(struct mmc_host *host) 
	WARN_ON(!host->claimed);



	/* Make sure we are at 3.3V signalling voltage */

	err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330);

	err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330, false);

	if (err)

		return err;