diff options
| author | Per Forlin <per.forlin@stericsson.com> | 2011-11-14 11:02:28 (GMT) |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2012-01-12 04:58:41 (GMT) |
| commit | 5a09262744a0b84719b933ac66801de058776755 (patch) | |
| tree | b0c089d7e0fd94a896c323d94ed7fa860e20f606 | |
| parent | a303c5319c8e6ab0e744ebca118da8420043b2c3 (diff) | |
| download | linux-5a09262744a0b84719b933ac66801de058776755.tar.xz | |
mmc: mmci: add capabilities2 for MMC_CAP2
Signed-off-by: Per Forlin <per.forlin@stericsson.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
| -rw-r--r-- | drivers/mmc/host/mmci.c | 1 | ||||
| -rw-r--r-- | include/linux/amba/mmci.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 50b5f99..8eabf99 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1239,6 +1239,7 @@ static int __devinit mmci_probe(struct amba_device *dev, if (host->vcc == NULL) mmc->ocr_avail = plat->ocr_mask; mmc->caps = plat->capabilities; + mmc->caps2 = plat->capabilities2; /* * We can do SGIO diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h index 2111481..0101e9c 100644 --- a/include/linux/amba/mmci.h +++ b/include/linux/amba/mmci.h @@ -30,6 +30,7 @@ struct dma_chan; * @cd_invert: true if the gpio_cd pin value is active low * @capabilities: the capabilities of the block as implemented in * this platform, signify anything MMC_CAP_* from mmc/host.h + * @capabilities2: more capabilities, MMC_CAP2_* from mmc/host.h * @dma_filter: function used to select an appropriate RX and TX * DMA channel to be used for DMA, if and only if you're deploying the * generic DMA engine @@ -52,6 +53,7 @@ struct mmci_platform_data { int gpio_cd; bool cd_invert; unsigned long capabilities; + unsigned long capabilities2; bool (*dma_filter)(struct dma_chan *chan, void *filter_param); void *dma_rx_param; void *dma_tx_param; |