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

Commit f168359e authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: core: Add 'card' to drive strength selection callback 



In preparation for supporting also eMMC drive strength,
add the 'card' as a parameter so that the callback can
distinguish different types of cards if necessary.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent fa021cef

drivers/mmc/core/sd.c

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ static int sd_select_driver_type(struct mmc_card *card, u8 *status) 
	 * return what is possible given the options

	 */

	mmc_host_clk_hold(card->host);

	drive_strength = card->host->ops->select_drive_strength(

	drive_strength = card->host->ops->select_drive_strength(card,

		card->sw_caps.uhs_max_dtr,

		host_drv_type, card_drv_type, &drv_type);

	mmc_host_clk_release(card->host);

drivers/mmc/core/sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static void sdio_select_driver_type(struct mmc_card *card) 
	 * information and let the hardware specific code

	 * return what is possible given the options

	 */

	drive_strength = card->host->ops->select_drive_strength(

	drive_strength = card->host->ops->select_drive_strength(card,

		card->sw_caps.uhs_max_dtr,

		host_drv_type, card_drv_type, &drv_type);

include/linux/mmc/host.h

+2 −1
Original line number Diff line number Diff line
@@ -132,7 +132,8 @@ struct mmc_host_ops { 


	/* Prepare HS400 target operating frequency depending host driver */

	int	(*prepare_hs400_tuning)(struct mmc_host *host, struct mmc_ios *ios);

	int	(*select_drive_strength)(unsigned int max_dtr, int host_drv,

	int	(*select_drive_strength)(struct mmc_card *card,

					 unsigned int max_dtr, int host_drv,

					 int card_drv, int *drv_type);

	void	(*hw_reset)(struct mmc_host *host);

	void	(*card_event)(struct mmc_host *host);