diff options
| author | Naveen Kumar Arepalli <naveenk@nvidia.com> | 2013-03-04 16:18:00 +0530 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2013-03-11 02:37:12 -0700 |
| commit | 2ee31b7823bdb51a64c18d4e311e786aa3b8acbf (patch) | |
| tree | 3a40f09475a942f7615dc49d544962bbb7edf59a /drivers/mmc/core | |
| parent | f8304fa2c3a1e073a90b9abd8bbd6aaf629737cf (diff) | |
Revert "mmc: core: Support packed command for eMMC4.5 device"
Packed command implementation is available in Upstream.
Use Upstream Packed comamnd code.
Bug 1242730
This reverts commit fa3a748000b65ad4854a95761b6067f89f1c4c61.
Change-Id: I807d6911aa20e9fe1664686bf43811bec7d274f5
Signed-off-by: Naveen Kumar Arepalli <naveenk@nvidia.com>
Reviewed-on: http://git-master/r/206215
Reviewed-by: Mandar Padmawar <mpadmawar@nvidia.com>
Tested-by: Mandar Padmawar <mpadmawar@nvidia.com>
Diffstat (limited to 'drivers/mmc/core')
| -rw-r--r-- | drivers/mmc/core/mmc.c | 24 | ||||
| -rw-r--r-- | drivers/mmc/core/mmc_ops.c | 1 |
2 files changed, 0 insertions, 25 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index fb2fbb66a761..a12d8dfc9d24 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -475,11 +475,6 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd) card->ext_csd.boot_ro_lockable = true; } - card->ext_csd.max_packed_writes = - ext_csd[EXT_CSD_MAX_PACKED_WRITES]; - card->ext_csd.max_packed_reads = - ext_csd[EXT_CSD_MAX_PACKED_READS]; - if (card->ext_csd.rev >= 5) { /* check whether the eMMC card supports HPI */ if (ext_csd[EXT_CSD_HPI_FEATURES] & 0x1) { @@ -1328,25 +1323,6 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, } } - if ((host->caps2 & MMC_CAP2_PACKED_CMD) && - (card->ext_csd.max_packed_writes > 0) && - (card->ext_csd.max_packed_reads > 0)) { - err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, - EXT_CSD_EXP_EVENTS_CTRL, - EXT_CSD_PACKED_EVENT_EN, - card->ext_csd.generic_cmd6_time); - if (err && err != -EBADMSG) - goto free_card; - if (err) { - pr_warning("%s: Enabling packed event failed\n", - mmc_hostname(card->host)); - card->ext_csd.packed_event_en = 0; - err = 0; - } else { - card->ext_csd.packed_event_en = 1; - } - } - if (!oldcard) host->card = card; diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index 7a899ccb04f1..ea9076608b8c 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -335,7 +335,6 @@ int mmc_send_ext_csd(struct mmc_card *card, u8 *ext_csd) return mmc_send_cxd_data(card, card->host, MMC_SEND_EXT_CSD, ext_csd, 512); } -EXPORT_SYMBOL_GPL(mmc_send_ext_csd); int mmc_spi_read_ocr(struct mmc_host *host, int highcap, u32 *ocrp) { |