* [PATCH] ARM: mmci: add capabilities2 for MMC_CAP2
@ 2011-11-14 11:02 Per Forlin
2011-11-17 7:42 ` Linus Walleij
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Per Forlin @ 2011-11-14 11:02 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Per Forlin <per.forlin@stericsson•com>
---
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(-)
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 4602771..c1cf80c 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -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
diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h
index 2111481..3749e13 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;
--
1.6.3.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] ARM: mmci: add capabilities2 for MMC_CAP2
2011-11-14 11:02 [PATCH] ARM: mmci: add capabilities2 for MMC_CAP2 Per Forlin
@ 2011-11-17 7:42 ` Linus Walleij
2011-11-29 13:43 ` Ulf Hansson
2011-11-30 11:39 ` Linus Walleij
2 siblings, 0 replies; 5+ messages in thread
From: Linus Walleij @ 2011-11-17 7:42 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 14, 2011 at 12:02 PM, Per Forlin <per.forlin@stericsson•com> wrote:
Some more verbose blurb on the patch here maybe?
> Signed-off-by: Per Forlin <per.forlin@stericsson•com>
> ---
> 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 <linus.walleij@linaro•org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: mmci: add capabilities2 for MMC_CAP2
2011-11-14 11:02 [PATCH] ARM: mmci: add capabilities2 for MMC_CAP2 Per Forlin
2011-11-17 7:42 ` Linus Walleij
@ 2011-11-29 13:43 ` Ulf Hansson
2011-11-30 11:39 ` Linus Walleij
2 siblings, 0 replies; 5+ messages in thread
From: Ulf Hansson @ 2011-11-29 13:43 UTC (permalink / raw)
To: linux-arm-kernel
Per FORLIN wrote:
> Signed-off-by: Per Forlin <per.forlin@stericsson•com>
> ---
> 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.
>
Acked-by: Ulf Hansson <ulf.hansson@stericsson•com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: mmci: add capabilities2 for MMC_CAP2
2011-11-14 11:02 [PATCH] ARM: mmci: add capabilities2 for MMC_CAP2 Per Forlin
2011-11-17 7:42 ` Linus Walleij
2011-11-29 13:43 ` Ulf Hansson
@ 2011-11-30 11:39 ` Linus Walleij
2011-12-01 17:41 ` Chris Ball
2 siblings, 1 reply; 5+ messages in thread
From: Linus Walleij @ 2011-11-30 11:39 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 14, 2011 at 12:02 PM, Per Forlin <per.forlin@stericsson•com> wrote:
> Signed-off-by: Per Forlin <per.forlin@stericsson•com>
> ---
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: mmci: add capabilities2 for MMC_CAP2
2011-11-30 11:39 ` Linus Walleij
@ 2011-12-01 17:41 ` Chris Ball
0 siblings, 0 replies; 5+ messages in thread
From: Chris Ball @ 2011-12-01 17:41 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Wed, Nov 30 2011, Linus Walleij wrote:
> On Mon, Nov 14, 2011 at 12:02 PM, Per Forlin <per.forlin@stericsson•com> wrote:
>
>> Signed-off-by: Per Forlin <per.forlin@stericsson•com>
>> ---
>> 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.
--
Chris Ball <cjb@laptop•org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-12-01 17:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-14 11:02 [PATCH] ARM: mmci: add capabilities2 for MMC_CAP2 Per Forlin
2011-11-17 7:42 ` Linus Walleij
2011-11-29 13:43 ` Ulf Hansson
2011-11-30 11:39 ` Linus Walleij
2011-12-01 17:41 ` Chris Ball
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox