Merge tag 'mmc-merge-for-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / mmc / host / mmci.c

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index efc822df4b75fcdaabef43ada50db5c22c92b715..f0fcce40cd8daa27a6a10e44bb28ad9abcf5624d 100644 (file)
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -96,6 +96,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,
@@ -1454,7 +1465,7 @@ static int __devinit mmci_probe(struct amba_device *dev,
        if (ret)
                goto unmap;
 
-       if (dev->irq[1] == NO_IRQ || !dev->irq[1])
+       if (!dev->irq[1])
                host->singleirq = true;
        else {
                ret = request_irq(dev->irq[1], mmci_pio_irq, IRQF_SHARED,
@@ -1625,6 +1636,11 @@ static struct amba_id mmci_ids[] = {
                .mask   = 0x00ffffff,
                .data   = &variant_u300,
        },
+       {
+               .id     = 0x10180180,
+               .mask   = 0xf0ffffff,
+               .data   = &variant_nomadik,
+       },
        {
                .id     = 0x00280180,
                .mask   = 0x00ffffff,