Skip to contentSkip to conversation

ARM: mmci: add capabilities2 for MMC_CAP2

PATCH New Per Forlin 4 participants 5 messages Nov 14, 2011 – Dec 1, 2011

Subsystems (2)
MMC, SD and SDIO Arm primecell mmci PL180/1 driver
lore
Share & tools
lore

Per Forlin

author
#0 lore raw

PATCH 1/1 ARM: mmci: add capabilities2 for MMC_CAP2

Signed-off-by Per Forlin <[email protected]>

---
This patch depends on patches adding CAP2 available on mmc-next. Chris, would you mind merging this through your tree when it has been accepted.

 drivers/mmc/host/mmci.c   |    1 +
 include/linux/amba/mmci.h |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)
drivers/mmc/host/mmci.c +1 -0
index 4602771..c1cf80c 100644
@@ -1231,6 +1231,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
include/linux/amba/mmci.h +2 -0
index 2111481..3749e13 100644
@@ -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;
Signature · 1 line
1.6.3.3
#1 lore raw

PATCH 1/1 ARM: mmci: add capabilities2 for MMC_CAP2

On Mon, Nov 14, 2011 at 12:02 PM, Per Forlin <[email protected]> wrote:

Some more verbose blurb on the patch here maybe?

Quoted 5 lines
Signed-off-by Per Forlin <[email protected]>

---
This patch depends on patches adding CAP2 available on mmc-next. Chris, would you mind merging this through your tree when it has been accepted.

Seems like the right way to pass caps from the platform.

Acked-by Linus Walleij <[email protected]>

Yours,
Linus Walleij

#3 lore raw

PATCH 1/1 ARM: mmci: add capabilities2 for MMC_CAP2

In reply to Per Forlin
Quoted 5 lines · Per Forlin
Signed-off-by Per Forlin <[email protected]>

---
This patch depends on patches adding CAP2 available on mmc-next. Chris, would you mind merging this through your tree when it has been accepted.

Chris are you taking this into your tree?

Thanks,
Linus Walleij

#4 lore raw

PATCH 1/1 ARM: mmci: add capabilities2 for MMC_CAP2

Hi,

Quoted 9 lines · Linus Walleij
Quoted 5 lines · Per Forlin
Signed-off-by Per Forlin <[email protected]>

---
This patch depends on patches adding CAP2 available on mmc-next. Chris, would you mind merging this through your tree when it has been accepted.

Chris are you taking this into your tree?

Thanks, pushed to mmc-next for 3.3.

- Chris.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child