diff options
| author | Eric Miao <eric.miao@marvell.com> | 2008-09-11 10:27:30 +0800 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-09-25 09:54:55 +0100 |
| commit | 0ffcbfd54ea81ca24c0749f55ca4fcf3e2bdc23e (patch) | |
| tree | 46890e5788964978c5ab0ea915decf8dbd772929 /drivers/mmc/host/pxamci.c | |
| parent | 2b12797c59d60379858050255046dacfbee68a8b (diff) | |
| download | kernel_samsung_espresso10-0ffcbfd54ea81ca24c0749f55ca4fcf3e2bdc23e.zip kernel_samsung_espresso10-0ffcbfd54ea81ca24c0749f55ca4fcf3e2bdc23e.tar.gz kernel_samsung_espresso10-0ffcbfd54ea81ca24c0749f55ca4fcf3e2bdc23e.tar.bz2 | |
[ARM] pxa: make cpu_is_pxa2* macros more consistent
1. add a CPUID table in the comment
2. make cpu_is_pxa25x() true for PXA210/250/255/26x
3. PXA210 is treated as PXA25x, all related code modified to
reflect this
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mmc/host/pxamci.c')
| -rw-r--r-- | drivers/mmc/host/pxamci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 55093ad..ebfaa99 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c @@ -520,7 +520,7 @@ static int pxamci_probe(struct platform_device *pdev) /* * Block length register is only 10 bits before PXA27x. */ - mmc->max_blk_size = (cpu_is_pxa21x() || cpu_is_pxa25x()) ? 1023 : 2048; + mmc->max_blk_size = cpu_is_pxa25x() ? 1023 : 2048; /* * Block count register is 16 bits. @@ -554,7 +554,7 @@ static int pxamci_probe(struct platform_device *pdev) MMC_VDD_32_33|MMC_VDD_33_34; mmc->caps = 0; host->cmdat = 0; - if (!cpu_is_pxa21x() && !cpu_is_pxa25x()) { + if (!cpu_is_pxa25x()) { mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ; host->cmdat |= CMDAT_SDIO_INT_EN; if (cpu_is_pxa300() || cpu_is_pxa310()) |