aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2015-11-05 10:01:33 -0500
committerUlf Hansson <ulf.hansson@linaro.org>2015-12-22 05:32:03 -0500
commit7b6471a968bf95e8d526393de125df3bc0c6a73a (patch)
tree039d2cc06decad9952d7d6b25d705dd956045856
parentc29536e85b5f7cf42b2e761f7ff35bc97de7cf95 (diff)
mmc: core: Remove MMC_CAP_RUNTIME_RESUME as it's redundant
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/host/dw_mmc-rockchip.c8
-rw-r--r--drivers/mmc/host/mtk-sd.c1
-rw-r--r--include/linux/mmc/host.h1
3 files changed, 0 insertions, 10 deletions
diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
index 9becebeeccd1..d9c92f31da64 100644
--- a/drivers/mmc/host/dw_mmc-rockchip.c
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
@@ -239,20 +239,12 @@ static int dw_mci_rockchip_init(struct dw_mci *host)
239 return 0; 239 return 0;
240} 240}
241 241
242/* Common capabilities of RK3288 SoC */
243static unsigned long dw_mci_rk3288_dwmmc_caps[4] = {
244 MMC_CAP_RUNTIME_RESUME, /* emmc */
245 MMC_CAP_RUNTIME_RESUME, /* sdmmc */
246 MMC_CAP_RUNTIME_RESUME, /* sdio0 */
247 MMC_CAP_RUNTIME_RESUME, /* sdio1 */
248};
249static const struct dw_mci_drv_data rk2928_drv_data = { 242static const struct dw_mci_drv_data rk2928_drv_data = {
250 .prepare_command = dw_mci_rockchip_prepare_command, 243 .prepare_command = dw_mci_rockchip_prepare_command,
251 .init = dw_mci_rockchip_init, 244 .init = dw_mci_rockchip_init,
252}; 245};
253 246
254static const struct dw_mci_drv_data rk3288_drv_data = { 247static const struct dw_mci_drv_data rk3288_drv_data = {
255 .caps = dw_mci_rk3288_dwmmc_caps,
256 .prepare_command = dw_mci_rockchip_prepare_command, 248 .prepare_command = dw_mci_rockchip_prepare_command,
257 .set_ios = dw_mci_rk3288_set_ios, 249 .set_ios = dw_mci_rk3288_set_ios,
258 .execute_tuning = dw_mci_rk3288_execute_tuning, 250 .execute_tuning = dw_mci_rk3288_execute_tuning,
diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
index 33dfd7e72516..a5beb3618240 100644
--- a/drivers/mmc/host/mtk-sd.c
+++ b/drivers/mmc/host/mtk-sd.c
@@ -1543,7 +1543,6 @@ static int msdc_drv_probe(struct platform_device *pdev)
1543 mmc->f_min = host->src_clk_freq / (4 * 255); 1543 mmc->f_min = host->src_clk_freq / (4 * 255);
1544 1544
1545 mmc->caps |= MMC_CAP_ERASE | MMC_CAP_CMD23; 1545 mmc->caps |= MMC_CAP_ERASE | MMC_CAP_CMD23;
1546 mmc->caps |= MMC_CAP_RUNTIME_RESUME;
1547 /* MMC core transfer sizes tunable parameters */ 1546 /* MMC core transfer sizes tunable parameters */
1548 mmc->max_segs = MAX_BD_NUM; 1547 mmc->max_segs = MAX_BD_NUM;
1549 mmc->max_seg_size = BDMA_DESC_BUFLEN; 1548 mmc->max_seg_size = BDMA_DESC_BUFLEN;
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 8673ffe3d86e..9b04e717bb86 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -259,7 +259,6 @@ struct mmc_host {
259#define MMC_CAP_UHS_SDR50 (1 << 17) /* Host supports UHS SDR50 mode */ 259#define MMC_CAP_UHS_SDR50 (1 << 17) /* Host supports UHS SDR50 mode */
260#define MMC_CAP_UHS_SDR104 (1 << 18) /* Host supports UHS SDR104 mode */ 260#define MMC_CAP_UHS_SDR104 (1 << 18) /* Host supports UHS SDR104 mode */
261#define MMC_CAP_UHS_DDR50 (1 << 19) /* Host supports UHS DDR50 mode */ 261#define MMC_CAP_UHS_DDR50 (1 << 19) /* Host supports UHS DDR50 mode */
262#define MMC_CAP_RUNTIME_RESUME (1 << 20) /* Resume at runtime_resume. */
263#define MMC_CAP_DRIVER_TYPE_A (1 << 23) /* Host supports Driver Type A */ 262#define MMC_CAP_DRIVER_TYPE_A (1 << 23) /* Host supports Driver Type A */
264#define MMC_CAP_DRIVER_TYPE_C (1 << 24) /* Host supports Driver Type C */ 263#define MMC_CAP_DRIVER_TYPE_C (1 << 24) /* Host supports Driver Type C */
265#define MMC_CAP_DRIVER_TYPE_D (1 << 25) /* Host supports Driver Type D */ 264#define MMC_CAP_DRIVER_TYPE_D (1 << 25) /* Host supports Driver Type D */