AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ARM: 6246/1: mmci: support larger MMCIDATALENGTH register

Browse Source 
The Ux500 variant has a 24-bit MMCIDATALENGTH register, as opposed to
the 16-bit one on the ARM version.

Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Rabin Vincent 2010-07-21 12:55:59 +01:00 committed by Russell King
parent 4380c14fd7
commit 08458ef6ee
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mmc/host/mmci.c
View File

@ -40,22 +40,27 @@ static unsigned int fmax = 515633;
* struct variant_data - MMCI variant-specific quirks * struct variant_data - MMCI variant-specific quirks
* @clkreg: default value for MCICLOCK register * @clkreg: default value for MCICLOCK register
* @clkreg_enable: enable value for MMCICLOCK register * @clkreg_enable: enable value for MMCICLOCK register
* @datalength_bits: number of bits in the MMCIDATALENGTH register
*/ */
struct variant_data { struct variant_data {
unsigned int clkreg; unsigned int clkreg;
unsigned int clkreg_enable; unsigned int clkreg_enable;
unsigned int datalength_bits;
}; };
static struct variant_data variant_arm = { static struct variant_data variant_arm = {
.datalength_bits = 16,
}; };
static struct variant_data variant_u300 = { static struct variant_data variant_u300 = {
.clkreg_enable = 1 << 13, /* HWFCEN */ .clkreg_enable = 1 << 13, /* HWFCEN */
.datalength_bits = 16,
}; };
static struct variant_data variant_ux500 = { static struct variant_data variant_ux500 = {
.clkreg = MCI_CLK_ENABLE, .clkreg = MCI_CLK_ENABLE,
.clkreg_enable = 1 << 14, /* HWFCEN */ .clkreg_enable = 1 << 14, /* HWFCEN */
.datalength_bits = 24,
}; };
/* /*
* This must be called with host->lock held * This must be called with host->lock held
@ -699,10 +704,11 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
mmc->max_phys_segs = NR_SG; mmc->max_phys_segs = NR_SG;
/* /*
* Since we only have a 16-bit data length register, we must * Since only a certain number of bits are valid in the data length
* ensure that we don't exceed 2^16-1 bytes in a single request. * register, we must ensure that we don't exceed 2^num-1 bytes in a
* single request.
*/ */
mmc->max_req_size = 65535; mmc->max_req_size = (1 << variant->datalength_bits) - 1;
/* /*
* Set the maximum segment size. Since we aren't doing DMA * Set the maximum segment size. Since we aren't doing DMA