aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mmc/host/Kconfig6
-rw-r--r--drivers/mmc/host/sh_mmcif.c20
2 files changed, 0 insertions, 26 deletions
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 859e352d0b5f..d618e8673996 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -466,12 +466,6 @@ config MMC_SH_MMCIF
466 466
467 This driver supports MMCIF in sh7724/sh7757/sh7372. 467 This driver supports MMCIF in sh7724/sh7757/sh7372.
468 468
469config SH_MMCIF_DMA
470 bool "Use DMA for MMCIF"
471 depends on MMC_SH_MMCIF
472 help
473 Use SH dma-engine driver for data transfer
474
475config MMC_JZ4740 469config MMC_JZ4740
476 tristate "JZ4740 SD/Multimedia Card Interface support" 470 tristate "JZ4740 SD/Multimedia Card Interface support"
477 depends on MACH_JZ4740 471 depends on MACH_JZ4740
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index d09a2b38eeeb..12884c270171 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -184,7 +184,6 @@ static inline void sh_mmcif_bitclr(struct sh_mmcif_host *host,
184 writel(~val & readl(host->addr + reg), host->addr + reg); 184 writel(~val & readl(host->addr + reg), host->addr + reg);
185} 185}
186 186
187#ifdef CONFIG_SH_MMCIF_DMA
188static void mmcif_dma_complete(void *arg) 187static void mmcif_dma_complete(void *arg)
189{ 188{
190 struct sh_mmcif_host *host = arg; 189 struct sh_mmcif_host *host = arg;
@@ -367,25 +366,6 @@ static void sh_mmcif_release_dma(struct sh_mmcif_host *host)
367 366
368 host->dma_sglen = 0; 367 host->dma_sglen = 0;
369} 368}
370#else
371static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host)
372{
373}
374
375static void sh_mmcif_start_dma_rx(struct sh_mmcif_host *host)
376{
377}
378
379static void sh_mmcif_request_dma(struct sh_mmcif_host *host,
380 struct sh_mmcif_plat_data *pdata)
381{
382 /* host->chan_tx, host->chan_tx and host->dma_sglen are all zero */
383}
384
385static void sh_mmcif_release_dma(struct sh_mmcif_host *host)
386{
387}
388#endif
389 369
390static void sh_mmcif_clock_control(struct sh_mmcif_host *host, unsigned int clk) 370static void sh_mmcif_clock_control(struct sh_mmcif_host *host, unsigned int clk)
391{ 371{