ARM: 7378/1: mmci: add support for the Nomadik MMCI variant
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 10 Apr 2012 16:43:59 +0000 (17:43 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 25 Apr 2012 18:55:19 +0000 (19:55 +0100)
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.

Acked-by: Ulf Hansson <ulf.hansson@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
drivers/mmc/host/mmci.c

index 032b847..d115916 100644 (file)
@@ -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,