linux-mmc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: mmci: add support for the Nomadik MMCI variant
@ 2012-04-09 21:03 Linus Walleij
  2012-04-10 13:44 ` Ulf Hansson
  0 siblings, 1 reply; 2+ messages in thread
From: Linus Walleij @ 2012-04-09 21:03 UTC (permalink / raw)
  To: linux-arm-kernel, linux-mmc; +Cc: Linus Walleij

The Nomadik variant is somewhere inbetween the U300 and the Ux500
variant, its actually expose the same primecell ID as the U300
but had different characteristics so it needs a small revision
bump and hard-coding from the board/device tree. After this it
works just fine.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 drivers/mmc/host/mmci.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 032b847..d115916 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -94,6 +94,17 @@ static struct variant_data variant_u300 = {
 	.signal_direction	= true,
 };
 
+static struct variant_data variant_nomadik = {
+	.fifosize		= 16 * 4,
+	.fifohalfsize		= 8 * 4,
+	.clkreg			= MCI_CLK_ENABLE,
+	.datalength_bits	= 24,
+	.sdio			= true,
+	.st_clkdiv		= true,
+	.pwrreg_powerup		= MCI_PWR_ON,
+	.signal_direction	= true,
+};
+
 static struct variant_data variant_ux500 = {
 	.fifosize		= 30 * 4,
 	.fifohalfsize		= 8 * 4,
@@ -1569,6 +1580,11 @@ static struct amba_id mmci_ids[] = {
 		.data	= &variant_u300,
 	},
 	{
+		.id     = 0x10180180,
+		.mask   = 0xf0ffffff,
+		.data	= &variant_nomadik,
+	},
+	{
 		.id     = 0x00280180,
 		.mask   = 0x00ffffff,
 		.data	= &variant_u300,
-- 
1.7.7.6


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] ARM: mmci: add support for the Nomadik MMCI variant
  2012-04-09 21:03 [PATCH] ARM: mmci: add support for the Nomadik MMCI variant Linus Walleij
@ 2012-04-10 13:44 ` Ulf Hansson
  0 siblings, 0 replies; 2+ messages in thread
From: Ulf Hansson @ 2012-04-10 13:44 UTC (permalink / raw)
  To: Linus Walleij
  Cc: linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org

On 04/09/2012 11:03 PM, Linus Walleij wrote:
> The Nomadik variant is somewhere inbetween the U300 and the Ux500
> variant, its actually expose the same primecell ID as the U300
> but had different characteristics so it needs a small revision
> bump and hard-coding from the board/device tree. After this it
> works just fine.
>
> Signed-off-by: Linus Walleij<linus.walleij@linaro.org>

Looks good to me. Acked-by: Ulf Hansson <ulf.hansson@stericsson.com>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-04-10 13:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-09 21:03 [PATCH] ARM: mmci: add support for the Nomadik MMCI variant Linus Walleij
2012-04-10 13:44 ` Ulf Hansson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).