mmc: core: Record card drive strength

ahunter6 · storulf · commit 3853a042325e · 2015-06-01T09:07:13.000+02:00
In preparation for adding drive strength support
for eMMC, add drive_strength to struct mmc_card
to record the card drive strength for UHS-I modes
and HS200 / HS400. For eMMC this will be needed
when switching between HS200 and HS400.

Signed-off-by: Adrian Hunter &lt;adrian.hunter@intel.com&gt;
Signed-off-by: Ulf Hansson &lt;ulf.hansson@linaro.org&gt;
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
@@ -389,6 +389,8 @@ static int sd_select_driver_type(struct mmc_card *card, u8 *status)
 	int card_drv_type, drive_strength, drv_type;
 	int err;
 
+	card->drive_strength = 0;
+
 	card_drv_type = card->sw_caps.sd3_drv_type | SD_DRIVER_TYPE_B;
 
 	drive_strength = mmc_select_drive_strength(card,
@@ -404,6 +406,7 @@ static int sd_select_driver_type(struct mmc_card *card, u8 *status)
 				mmc_hostname(card->host));
 			return 0;
 		}
+		card->drive_strength = drive_strength;
 	}
 
 	if (drv_type)
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
@@ -406,6 +406,8 @@ static void sdio_select_driver_type(struct mmc_card *card)
 	unsigned char card_strength;
 	int err;
 
+	card->drive_strength = 0;
+
 	card_drv_type = card->sw_caps.sd3_drv_type | SD_DRIVER_TYPE_B;
 
 	drive_strength = mmc_select_drive_strength(card,
@@ -427,6 +429,7 @@ static void sdio_select_driver_type(struct mmc_card *card)
 				       card_strength, NULL);
 		if (err)
 			return;
+		card->drive_strength = drive_strength;
 	}
 
 	if (drv_type)
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
@@ -305,6 +305,7 @@ struct mmc_card {
 
 	unsigned int		sd_bus_speed;	/* Bus Speed Mode set for the card */
 	unsigned int		mmc_avail_type;	/* supported device type by both host and card */
+	unsigned int		drive_strength;	/* for UHS-I, HS200 or HS400 */
 
 	struct dentry		*debugfs_root;
 	struct mmc_part	part[MMC_NUM_PHY_PARTITION]; /* physical partitions */

Original file line number	Diff line number	Diff line change
`@@ -389,6 +389,8 @@ static int sd_select_driver_type(struct mmc_card card, u8 status)`
`389`	`389`	`int card_drv_type, drive_strength, drv_type;`
`390`	`390`	`int err;`
`391`	`391`
	`392`	`+ card->drive_strength = 0;`
	`393`	`+`
`392`	`394`	`card_drv_type = card->sw_caps.sd3_drv_type \| SD_DRIVER_TYPE_B;`
`393`	`395`
`394`	`396`	`drive_strength = mmc_select_drive_strength(card,`
`@@ -404,6 +406,7 @@ static int sd_select_driver_type(struct mmc_card card, u8 status)`
`404`	`406`	`mmc_hostname(card->host));`
`405`	`407`	`return 0;`
`406`	`408`	`}`
	`409`	`+ card->drive_strength = drive_strength;`
`407`	`410`	`}`
`408`	`411`
`409`	`412`	`if (drv_type)`