From c3207ac8c1a4b1f44dd773df8f002a0cc81b7df2 Mon Sep 17 00:00:00 2001
From: Pawel Moll <pawel.moll@arm.com>
Date: Fri, 11 Mar 2011 17:18:07 +0000
Subject: [PATCH] --- yaml --- r: 243409 b: refs/heads/master c:
 768fbc1876b3239f4c463c00ea1e78725554cf21 h: refs/heads/master i:   243407:
 d1901be7f5094b4c3f8d048417c494fe30d736d7 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/mmc/host/mmci.c | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2957715f24ca..146a95173f5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5289a433dd7b15df248d1f0272f52be38fe6971
+refs/heads/master: 768fbc1876b3239f4c463c00ea1e78725554cf21
diff --git a/trunk/drivers/mmc/host/mmci.c b/trunk/drivers/mmc/host/mmci.c
index 5bbb87d10251..b4a7e4fba90f 100644
--- a/trunk/drivers/mmc/host/mmci.c
+++ b/trunk/drivers/mmc/host/mmci.c
@@ -68,6 +68,12 @@ static struct variant_data variant_arm = {
 	.datalength_bits	= 16,
 };
 
+static struct variant_data variant_arm_extended_fifo = {
+	.fifosize		= 128 * 4,
+	.fifohalfsize		= 64 * 4,
+	.datalength_bits	= 16,
+};
+
 static struct variant_data variant_u300 = {
 	.fifosize		= 16 * 4,
 	.fifohalfsize		= 8 * 4,
@@ -1277,9 +1283,14 @@ static int mmci_resume(struct amba_device *dev)
 static struct amba_id mmci_ids[] = {
 	{
 		.id	= 0x00041180,
-		.mask	= 0x000fffff,
+		.mask	= 0xff0fffff,
 		.data	= &variant_arm,
 	},
+	{
+		.id	= 0x01041180,
+		.mask	= 0xff0fffff,
+		.data	= &variant_arm_extended_fifo,
+	},
 	{
 		.id	= 0x00041181,
 		.mask	= 0x000fffff,