Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 243409
b: refs/heads/master
c: 768fbc1
h: refs/heads/master
i:
  243407: d1901be
v: v3
  • Loading branch information
Pawel Moll authored and Chris Ball committed Mar 25, 2011
1 parent af69035 commit c3207ac
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a5289a433dd7b15df248d1f0272f52be38fe6971
refs/heads/master: 768fbc1876b3239f4c463c00ea1e78725554cf21
13 changes: 12 additions & 1 deletion trunk/drivers/mmc/host/mmci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit c3207ac

Please sign in to comment.