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

mmc: core: Factor out common code in drive strength selection 



Make a new function out of common code used for drive
strength selection.

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

drivers/mmc/core/core.c

+38 −0
Original line number Diff line number Diff line
@@ -1639,6 +1639,44 @@ void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type) 
	mmc_host_clk_release(host);

}



int mmc_select_drive_strength(struct mmc_card *card, unsigned int max_dtr,

			      int card_drv_type, int *drv_type)

{

	struct mmc_host *host = card->host;

	int host_drv_type = SD_DRIVER_TYPE_B;

	int drive_strength;



	*drv_type = 0;



	if (!host->ops->select_drive_strength)

		return 0;



	/* Use SD definition of driver strength for hosts */

	if (host->caps & MMC_CAP_DRIVER_TYPE_A)

		host_drv_type |= SD_DRIVER_TYPE_A;



	if (host->caps & MMC_CAP_DRIVER_TYPE_C)

		host_drv_type |= SD_DRIVER_TYPE_C;



	if (host->caps & MMC_CAP_DRIVER_TYPE_D)

		host_drv_type |= SD_DRIVER_TYPE_D;



	/*

	 * The drive strength that the hardware can support

	 * depends on the board design.  Pass the appropriate

	 * information and let the hardware specific code

	 * return what is possible given the options

	 */

	mmc_host_clk_hold(host);

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

							  host_drv_type,

							  card_drv_type,

							  drv_type);

	mmc_host_clk_release(host);



	return drive_strength;

}



/*

 * Apply power to the MMC stack.  This is a two-stage process.

 * First, we enable power to the card without the clock running.

drivers/mmc/core/core.h

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage, u32 ocr); 
int __mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage);

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

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

int mmc_select_drive_strength(struct mmc_card *card, unsigned int max_dtr,

			      int card_drv_type, int *drv_type);

void mmc_power_up(struct mmc_host *host, u32 ocr);

void mmc_power_off(struct mmc_host *host);

void mmc_power_cycle(struct mmc_host *host, u32 ocr);

drivers/mmc/core/sd.c

+3 −24
Original line number Diff line number Diff line
@@ -386,35 +386,14 @@ int mmc_sd_switch_hs(struct mmc_card *card) 


static int sd_select_driver_type(struct mmc_card *card, u8 *status)

{

	int host_drv_type = SD_DRIVER_TYPE_B;

	int card_drv_type, drive_strength, drv_type;

	int err;



	if (!card->host->ops->select_drive_strength)

		return 0;



	if (card->host->caps & MMC_CAP_DRIVER_TYPE_A)

		host_drv_type |= SD_DRIVER_TYPE_A;



	if (card->host->caps & MMC_CAP_DRIVER_TYPE_C)

		host_drv_type |= SD_DRIVER_TYPE_C;



	if (card->host->caps & MMC_CAP_DRIVER_TYPE_D)

		host_drv_type |= SD_DRIVER_TYPE_D;



	card_drv_type = card->sw_caps.sd3_drv_type | SD_DRIVER_TYPE_B;



	/*

	 * The drive strength that the hardware can support

	 * depends on the board design.  Pass the appropriate

	 * information and let the hardware specific code

	 * return what is possible given the options

	 */

	mmc_host_clk_hold(card->host);

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

	drive_strength = mmc_select_drive_strength(card,

						   card->sw_caps.uhs_max_dtr,

		host_drv_type, card_drv_type, &drv_type);

	mmc_host_clk_release(card->host);

						   card_drv_type, &drv_type);



	if (drive_strength) {

		err = mmc_sd_switch(card, 1, 2, drive_strength, status);

drivers/mmc/core/sdio.c

+3 −22
Original line number Diff line number Diff line
@@ -402,34 +402,15 @@ static unsigned char host_drive_to_sdio_drive(int host_strength) 


static void sdio_select_driver_type(struct mmc_card *card)

{

	int host_drv_type = SD_DRIVER_TYPE_B;

	int card_drv_type, drive_strength, drv_type;

	unsigned char card_strength;

	int err;



	if (!card->host->ops->select_drive_strength)

		return;



	if (card->host->caps & MMC_CAP_DRIVER_TYPE_A)

		host_drv_type |= SD_DRIVER_TYPE_A;



	if (card->host->caps & MMC_CAP_DRIVER_TYPE_C)

		host_drv_type |= SD_DRIVER_TYPE_C;



	if (card->host->caps & MMC_CAP_DRIVER_TYPE_D)

		host_drv_type |= SD_DRIVER_TYPE_D;



	card_drv_type = card->sw_caps.sd3_drv_type | SD_DRIVER_TYPE_B;



	/*

	 * The drive strength that the hardware can support

	 * depends on the board design.  Pass the appropriate

	 * information and let the hardware specific code

	 * return what is possible given the options

	 */

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

	drive_strength = mmc_select_drive_strength(card,

						   card->sw_caps.uhs_max_dtr,

		host_drv_type, card_drv_type, &drv_type);

						   card_drv_type, &drv_type);



	if (drive_strength) {

		/* if error just use default for drive strength B */