diff options
author | Jaehoon Chung <jh80.chung@samsung.com> | 2015-12-24 04:41:03 -0500 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2016-01-05 12:04:58 -0500 |
commit | 01a999e48995a35faaa513f811c335bce72917d6 (patch) | |
tree | c745d228975e072b0c4dc74bbf98265bd60a9382 | |
parent | 923a231c871120c08a74a1fda397fed184334924 (diff) |
mmc: dw_mmc: remove the unused quirks
Removed the unused quirks. These quirks don't used anywhere.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r-- | drivers/mmc/host/dw_mmc.c | 19 | ||||
-rw-r--r-- | include/linux/mmc/dw_mmc.h | 10 |
2 files changed, 2 insertions, 27 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index fb204ee6ff89..712835177e8b 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c | |||
@@ -1634,12 +1634,6 @@ static int dw_mci_command_complete(struct dw_mci *host, struct mmc_command *cmd) | |||
1634 | else | 1634 | else |
1635 | cmd->error = 0; | 1635 | cmd->error = 0; |
1636 | 1636 | ||
1637 | if (cmd->error) { | ||
1638 | /* newer ip versions need a delay between retries */ | ||
1639 | if (host->quirks & DW_MCI_QUIRK_RETRY_DELAY) | ||
1640 | mdelay(20); | ||
1641 | } | ||
1642 | |||
1643 | return cmd->error; | 1637 | return cmd->error; |
1644 | } | 1638 | } |
1645 | 1639 | ||
@@ -2355,16 +2349,6 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id) | |||
2355 | 2349 | ||
2356 | pending = mci_readl(host, MINTSTS); /* read-only mask reg */ | 2350 | pending = mci_readl(host, MINTSTS); /* read-only mask reg */ |
2357 | 2351 | ||
2358 | /* | ||
2359 | * DTO fix - version 2.10a and below, and only if internal DMA | ||
2360 | * is configured. | ||
2361 | */ | ||
2362 | if (host->quirks & DW_MCI_QUIRK_IDMAC_DTO) { | ||
2363 | if (!pending && | ||
2364 | ((mci_readl(host, STATUS) >> 17) & 0x1fff)) | ||
2365 | pending |= SDMMC_INT_DATA_OVER; | ||
2366 | } | ||
2367 | |||
2368 | if (pending) { | 2352 | if (pending) { |
2369 | /* Check volt switch first, since it can look like an error */ | 2353 | /* Check volt switch first, since it can look like an error */ |
2370 | if ((host->state == STATE_SENDING_CMD11) && | 2354 | if ((host->state == STATE_SENDING_CMD11) && |
@@ -3165,9 +3149,6 @@ int dw_mci_probe(struct dw_mci *host) | |||
3165 | /* Now that slots are all setup, we can enable card detect */ | 3149 | /* Now that slots are all setup, we can enable card detect */ |
3166 | dw_mci_enable_cd(host); | 3150 | dw_mci_enable_cd(host); |
3167 | 3151 | ||
3168 | if (host->quirks & DW_MCI_QUIRK_IDMAC_DTO) | ||
3169 | dev_info(host->dev, "Internal DMAC interrupt fix enabled.\n"); | ||
3170 | |||
3171 | return 0; | 3152 | return 0; |
3172 | 3153 | ||
3173 | err_dmaunmap: | 3154 | err_dmaunmap: |
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index 7776afb0ffa5..89df7abedd67 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h | |||
@@ -235,16 +235,10 @@ struct dw_mci_dma_ops { | |||
235 | }; | 235 | }; |
236 | 236 | ||
237 | /* IP Quirks/flags. */ | 237 | /* IP Quirks/flags. */ |
238 | /* DTO fix for command transmission with IDMAC configured */ | ||
239 | #define DW_MCI_QUIRK_IDMAC_DTO BIT(0) | ||
240 | /* delay needed between retries on some 2.11a implementations */ | ||
241 | #define DW_MCI_QUIRK_RETRY_DELAY BIT(1) | ||
242 | /* High Speed Capable - Supports HS cards (up to 50MHz) */ | ||
243 | #define DW_MCI_QUIRK_HIGHSPEED BIT(2) | ||
244 | /* Unreliable card detection */ | 238 | /* Unreliable card detection */ |
245 | #define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(3) | 239 | #define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(0) |
246 | /* Timer for broken data transfer over scheme */ | 240 | /* Timer for broken data transfer over scheme */ |
247 | #define DW_MCI_QUIRK_BROKEN_DTO BIT(4) | 241 | #define DW_MCI_QUIRK_BROKEN_DTO BIT(1) |
248 | 242 | ||
249 | struct dma_pdata; | 243 | struct dma_pdata; |
250 | 244 | ||