Commit 8033c6e9 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  at91_mci: minor cleanup
  mmc: mmc host test driver
  mmc: Fix omap compile by replacing dev_name with dma_dev_name
parents 2d3cf588 e5c0ef90
...@@ -39,3 +39,15 @@ config SDIO_UART ...@@ -39,3 +39,15 @@ config SDIO_UART
SDIO function driver for SDIO cards that implements the UART SDIO function driver for SDIO cards that implements the UART
class, as well as the GPS class which appears like a UART. class, as well as the GPS class which appears like a UART.
config MMC_TEST
tristate "MMC host test driver"
default n
help
Development driver that performs a series of reads and writes
to a memory card in order to expose certain well known bugs
in host controllers. The tests are executed by writing to the
"test" file in sysfs under each card. Note that whatever is
on your card will be overwritten by these tests.
This driver is only of interest to those developing or
testing a host driver. Most people should say N here.
...@@ -8,6 +8,7 @@ endif ...@@ -8,6 +8,7 @@ endif
obj-$(CONFIG_MMC_BLOCK) += mmc_block.o obj-$(CONFIG_MMC_BLOCK) += mmc_block.o
mmc_block-objs := block.o queue.o mmc_block-objs := block.o queue.o
obj-$(CONFIG_MMC_TEST) += mmc_test.o
obj-$(CONFIG_SDIO_UART) += sdio_uart.o obj-$(CONFIG_SDIO_UART) += sdio_uart.o
This diff is collapsed.
...@@ -663,9 +663,12 @@ static void at91_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) ...@@ -663,9 +663,12 @@ static void at91_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
gpio_set_value(host->board->vcc_pin, 0); gpio_set_value(host->board->vcc_pin, 0);
break; break;
case MMC_POWER_UP: case MMC_POWER_UP:
case MMC_POWER_ON:
gpio_set_value(host->board->vcc_pin, 1); gpio_set_value(host->board->vcc_pin, 1);
break; break;
case MMC_POWER_ON:
break;
default:
WARN_ON(1);
} }
} }
} }
......
...@@ -1003,7 +1003,7 @@ static void mmc_omap_dma_cb(int lch, u16 ch_status, void *data) ...@@ -1003,7 +1003,7 @@ static void mmc_omap_dma_cb(int lch, u16 ch_status, void *data)
static int mmc_omap_get_dma_channel(struct mmc_omap_host *host, struct mmc_data *data) static int mmc_omap_get_dma_channel(struct mmc_omap_host *host, struct mmc_data *data)
{ {
const char *dev_name; const char *dma_dev_name;
int sync_dev, dma_ch, is_read, r; int sync_dev, dma_ch, is_read, r;
is_read = !(data->flags & MMC_DATA_WRITE); is_read = !(data->flags & MMC_DATA_WRITE);
...@@ -1018,21 +1018,21 @@ static int mmc_omap_get_dma_channel(struct mmc_omap_host *host, struct mmc_data ...@@ -1018,21 +1018,21 @@ static int mmc_omap_get_dma_channel(struct mmc_omap_host *host, struct mmc_data
if (is_read) { if (is_read) {
if (host->id == 1) { if (host->id == 1) {
sync_dev = OMAP_DMA_MMC_RX; sync_dev = OMAP_DMA_MMC_RX;
dev_name = "MMC1 read"; dma_dev_name = "MMC1 read";
} else { } else {
sync_dev = OMAP_DMA_MMC2_RX; sync_dev = OMAP_DMA_MMC2_RX;
dev_name = "MMC2 read"; dma_dev_name = "MMC2 read";
} }
} else { } else {
if (host->id == 1) { if (host->id == 1) {
sync_dev = OMAP_DMA_MMC_TX; sync_dev = OMAP_DMA_MMC_TX;
dev_name = "MMC1 write"; dma_dev_name = "MMC1 write";
} else { } else {
sync_dev = OMAP_DMA_MMC2_TX; sync_dev = OMAP_DMA_MMC2_TX;
dev_name = "MMC2 write"; dma_dev_name = "MMC2 write";
} }
} }
r = omap_request_dma(sync_dev, dev_name, mmc_omap_dma_cb, r = omap_request_dma(sync_dev, dma_dev_name, mmc_omap_dma_cb,
host, &dma_ch); host, &dma_ch);
if (r != 0) { if (r != 0) {
dev_dbg(mmc_dev(host->mmc), "omap_request_dma() failed with %d\n", r); dev_dbg(mmc_dev(host->mmc), "omap_request_dma() failed with %d\n", r);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment