mmc: mmci: add capabilities2 for MMC_CAP2
authorPer Forlin <per.forlin@stericsson.com>
Mon, 14 Nov 2011 11:02:28 +0000 (12:02 +0100)
committerChris Ball <cjb@laptop.org>
Thu, 12 Jan 2012 04:58:41 +0000 (23:58 -0500)
Signed-off-by: Per Forlin <per.forlin@stericsson.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/mmci.c
include/linux/amba/mmci.h

index 50b5f9926f6462d7836434c89a71213f418faa9c..8eabf999a858727fc4ca906ca017a22a9fb6e7f5 100644 (file)
@@ -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
index 21114810c7c0b687afa01f188e50d99bdbdafecb..0101e9c17fa1ec022c75f3655646c16aca9dd948 100644 (file)
@@ -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;