From af3dc37efb58acc244120a99bc379139f9d0c72f Mon Sep 17 00:00:00 2001 From: Pawel Moll Date: Thu, 24 Jan 2013 14:12:45 +0100 Subject: [PATCH] --- yaml --- r: 351129 b: refs/heads/master c: 3a37298ada749897ec2c5c1cdcd5932218eb2928 h: refs/heads/master i: 351127: ba758d34fa653a9c14dd6baedccfaa3cd5cf33e5 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/mmci.c | 13 +++++++++++++ trunk/drivers/mmc/host/mmci.h | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 78ab9740a54d..098a6b9b8e72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4670daef5e81aa312f5a18f571dbd8169ce079e +refs/heads/master: 3a37298ada749897ec2c5c1cdcd5932218eb2928 diff --git a/trunk/drivers/mmc/host/mmci.c b/trunk/drivers/mmc/host/mmci.c index 04efcdfeb5e1..dee9b73ce293 100644 --- a/trunk/drivers/mmc/host/mmci.c +++ b/trunk/drivers/mmc/host/mmci.c @@ -90,6 +90,14 @@ static struct variant_data variant_arm_extended_fifo = { .pwrreg_powerup = MCI_PWR_UP, }; +static struct variant_data variant_arm_extended_fifo_hwfc = { + .fifosize = 128 * 4, + .fifohalfsize = 64 * 4, + .clkreg_enable = MCI_ARM_HWFCEN, + .datalength_bits = 16, + .pwrreg_powerup = MCI_PWR_UP, +}; + static struct variant_data variant_u300 = { .fifosize = 16 * 4, .fifohalfsize = 8 * 4, @@ -1671,6 +1679,11 @@ static struct amba_id mmci_ids[] = { .mask = 0xff0fffff, .data = &variant_arm_extended_fifo, }, + { + .id = 0x02041180, + .mask = 0xff0fffff, + .data = &variant_arm_extended_fifo_hwfc, + }, { .id = 0x00041181, .mask = 0x000fffff, diff --git a/trunk/drivers/mmc/host/mmci.h b/trunk/drivers/mmc/host/mmci.h index a22213eeff88..1f33ad5333a0 100644 --- a/trunk/drivers/mmc/host/mmci.h +++ b/trunk/drivers/mmc/host/mmci.h @@ -28,6 +28,8 @@ #define MCI_ST_UX500_NEG_EDGE (1 << 13) #define MCI_ST_UX500_HWFCEN (1 << 14) #define MCI_ST_UX500_CLK_INV (1 << 15) +/* Modified PL180 on Versatile Express platform */ +#define MCI_ARM_HWFCEN (1 << 12) #define MMCIARGUMENT 0x008 #define MMCICOMMAND 0x00c