commit bd4ed2af494bf3e7b2b98660c924afe1f6bf2cd7
author Linux Build Service Account <lnxbuild@localhost> Thu Apr 10 13:20:14 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Apr 10 13:20:14 2014 -0700
tree ef21828751243a57c3dd9e7a1d15fa7b1b015eda
parent a77eaa0cf769545df239f869f6fa9179c7d822c9
parent c8cc1bdf48bd82586abefa8017f17dd1aa07dffd

Merge "platform : msm_shared Added support for byte addressing for emmc flash erase case."

platform/msm_shared/mmc_sdhci.c

diff --git a/platform/msm_shared/mmc_sdhci.c b/platform/msm_shared/mmc_sdhci.c
index 938cdeb..f7a82f3 100644
--- a/platform/msm_shared/mmc_sdhci.c
+++ b/platform/msm_shared/mmc_sdhci.c
@@ -1853,7 +1853,15 @@
 	else
 		cmd.cmd_index = CMD32_ERASE_WR_BLK_START;
 
-	cmd.argument = erase_start;
+	/*
+	 * Standard emmc cards use byte mode addressing
+	 * convert the block address to byte address before
+	 * sending the command
+	 */
+	if (card->type == MMC_TYPE_STD_MMC)
+		cmd.argument = erase_start * card->block_size;
+	else
+		cmd.argument = erase_start;
 	cmd.cmd_type = SDHCI_CMD_TYPE_NORMAL;
 	cmd.resp_type = SDHCI_CMD_RESP_R1;
 
@@ -1888,7 +1896,15 @@
 	else
 		cmd.cmd_index = CMD33_ERASE_WR_BLK_END;
 
-	cmd.argument = erase_end;
+	/*
+	 * Standard emmc cards use byte mode addressing
+	 * convert the block address to byte address before
+	 * sending the command
+	 */
+	if (card->type == MMC_TYPE_STD_MMC)
+		cmd.argument = erase_end * card->block_size;
+	else
+		cmd.argument = erase_end;
 	cmd.cmd_type = SDHCI_CMD_TYPE_NORMAL;
 	cmd.resp_type = SDHCI_CMD_RESP_R1;