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

Commit 2c9b3ebd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v4.5-rc1' of git://git.linaro.org/people/ulf.hansson/mmc 

Pull MMC fixes from Ulf Hansson:
 "Here are some mmc fixes intended for v4.5 rc1.

  MMC core:
   - Restore reset-gpios to be optional in pwrseq_simple
   - Allow SDIO tuple for CISTPL_SDIO_STD
   - Print correct voltage value in debugfs
   - Enable tuning according to the actual timing
   - Limit SD card power limit according to cards capabilities

  MMC host:
   - tmio_mmc_dma: don't print invalid DMA cookie
   - mmci: Pick the correct variant and allow 8-bit mode for Nomadik"

* tag 'mmc-v4.5-rc1' of git://git.linaro.org/people/ulf.hansson/mmc:
  mmc: pwrseq_simple: Make reset-gpios optional to match doc
  mmc: sdio_cis: fix unknown tuple for CISTPL_SDIO_STD
  mmc: debugfs: correct wrong voltage value
  mmc: tmio_mmc_dma: don't print invalid DMA cookie
  mmc: core: Enable tuning according to the actual timing
  mmc: mmci: support 8bit mode on the Nomadik
  mmc: mmci: fix an ages old detection error
  mmc: sd: limit SD card power limit according to cards capabilities
parents 48162a20 64a67d47

drivers/mmc/core/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int mmc_ios_show(struct seq_file *s, void *data) 
		str = "invalid";

		break;

	}

	seq_printf(s, "signal voltage:\t%u (%s)\n", ios->chip_select, str);

	seq_printf(s, "signal voltage:\t%u (%s)\n", ios->signal_voltage, str);



	switch (ios->drv_type) {

	case MMC_SET_DRIVER_TYPE_A:

drivers/mmc/core/pwrseq_simple.c

+14 −8
Original line number Diff line number Diff line
@@ -29,15 +29,18 @@ struct mmc_pwrseq_simple { 
static void mmc_pwrseq_simple_set_gpios_value(struct mmc_pwrseq_simple *pwrseq,

					      int value)

{

	int i;

	struct gpio_descs *reset_gpios = pwrseq->reset_gpios;



	if (!IS_ERR(reset_gpios)) {

		int i;

		int values[reset_gpios->ndescs];



		for (i = 0; i < reset_gpios->ndescs; i++)

			values[i] = value;



	gpiod_set_array_value_cansleep(reset_gpios->ndescs, reset_gpios->desc,

				       values);

		gpiod_set_array_value_cansleep(

			reset_gpios->ndescs, reset_gpios->desc, values);

	}

}



static void mmc_pwrseq_simple_pre_power_on(struct mmc_host *host)
@@ -79,6 +82,7 @@ static void mmc_pwrseq_simple_free(struct mmc_host *host) 
	struct mmc_pwrseq_simple *pwrseq = container_of(host->pwrseq,

					struct mmc_pwrseq_simple, pwrseq);



	if (!IS_ERR(pwrseq->reset_gpios))

		gpiod_put_array(pwrseq->reset_gpios);



	if (!IS_ERR(pwrseq->ext_clk))
@@ -112,7 +116,9 @@ struct mmc_pwrseq *mmc_pwrseq_simple_alloc(struct mmc_host *host, 
	}



	pwrseq->reset_gpios = gpiod_get_array(dev, "reset", GPIOD_OUT_HIGH);

	if (IS_ERR(pwrseq->reset_gpios)) {

	if (IS_ERR(pwrseq->reset_gpios) &&

	    PTR_ERR(pwrseq->reset_gpios) != -ENOENT &&

	    PTR_ERR(pwrseq->reset_gpios) != -ENOSYS) {

		ret = PTR_ERR(pwrseq->reset_gpios);

		goto clk_put;

	}

drivers/mmc/core/sd.c

+20 −8
Original line number Diff line number Diff line
@@ -329,6 +329,7 @@ static int mmc_read_switch(struct mmc_card *card) 
		card->sw_caps.sd3_bus_mode = status[13];

		/* Driver Strengths supported by the card */

		card->sw_caps.sd3_drv_type = status[9];

		card->sw_caps.sd3_curr_limit = status[7] | status[6] << 8;

	}



out:
@@ -545,14 +546,25 @@ static int sd_set_current_limit(struct mmc_card *card, u8 *status) 
	 * when we set current limit to 200ma, the card will draw 200ma, and

	 * when we set current limit to 400/600/800ma, the card will draw its

	 * maximum 300ma from the host.

	 *

	 * The above is incorrect: if we try to set a current limit that is

	 * not supported by the card, the card can rightfully error out the

	 * attempt, and remain at the default current limit.  This results

	 * in a 300mA card being limited to 200mA even though the host

	 * supports 800mA. Failures seen with SanDisk 8GB UHS cards with

	 * an iMX6 host. --rmk

	 */

	if (max_current >= 800)

	if (max_current >= 800 &&

	    card->sw_caps.sd3_curr_limit & SD_MAX_CURRENT_800)

		current_limit = SD_SET_CURRENT_LIMIT_800;

	else if (max_current >= 600)

	else if (max_current >= 600 &&

		 card->sw_caps.sd3_curr_limit & SD_MAX_CURRENT_600)

		current_limit = SD_SET_CURRENT_LIMIT_600;

	else if (max_current >= 400)

	else if (max_current >= 400 &&

		 card->sw_caps.sd3_curr_limit & SD_MAX_CURRENT_400)

		current_limit = SD_SET_CURRENT_LIMIT_400;

	else if (max_current >= 200)

	else if (max_current >= 200 &&

		 card->sw_caps.sd3_curr_limit & SD_MAX_CURRENT_200)

		current_limit = SD_SET_CURRENT_LIMIT_200;



	if (current_limit != SD_SET_CURRENT_NO_CHANGE) {
@@ -626,9 +638,9 @@ static int mmc_sd_init_uhs_card(struct mmc_card *card) 
	 * SDR104 mode SD-cards. Note that tuning is mandatory for SDR104.

	 */

	if (!mmc_host_is_spi(card->host) &&

		(card->sd_bus_speed == UHS_SDR50_BUS_SPEED ||

		 card->sd_bus_speed == UHS_DDR50_BUS_SPEED ||

		 card->sd_bus_speed == UHS_SDR104_BUS_SPEED)) {

		(card->host->ios.timing == MMC_TIMING_UHS_SDR50 ||

		 card->host->ios.timing == MMC_TIMING_UHS_DDR50 ||

		 card->host->ios.timing == MMC_TIMING_UHS_SDR104)) {

		err = mmc_execute_tuning(card);



		/*
@@ -638,7 +650,7 @@ static int mmc_sd_init_uhs_card(struct mmc_card *card) 
		 * difference between v3.00 and 3.01 spec means that CMD19

		 * tuning is also available for DDR50 mode.

		 */

		if (err && card->sd_bus_speed == UHS_DDR50_BUS_SPEED) {

		if (err && card->host->ios.timing == MMC_TIMING_UHS_DDR50) {

			pr_warn("%s: ddr50 tuning failed\n",

				mmc_hostname(card->host));

			err = 0;

drivers/mmc/core/sdio.c

+2 −2
Original line number Diff line number Diff line
@@ -535,8 +535,8 @@ static int mmc_sdio_init_uhs_card(struct mmc_card *card) 
	 * SDR104 mode SD-cards. Note that tuning is mandatory for SDR104.

	 */

	if (!mmc_host_is_spi(card->host) &&

	    ((card->sw_caps.sd3_bus_mode & SD_MODE_UHS_SDR50) ||

	     (card->sw_caps.sd3_bus_mode & SD_MODE_UHS_SDR104)))

	    ((card->host->ios.timing == MMC_TIMING_UHS_SDR50) ||

	      (card->host->ios.timing == MMC_TIMING_UHS_SDR104)))

		err = mmc_execute_tuning(card);

out:

	return err;

drivers/mmc/core/sdio_cis.c

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ static const struct cis_tpl cis_tpl_list[] = { 
	{	0x20,	4,	cistpl_manfid		},

	{	0x21,	2,	/* cistpl_funcid */	},

	{	0x22,	0,	cistpl_funce		},

	{	0x91,	2,	/* cistpl_sdio_std */	},

};



static int sdio_read_cis(struct mmc_card *card, struct sdio_func *func)