diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-09-10 22:27:30 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-09-25 04:54:55 -0400 |
commit | 0ffcbfd54ea81ca24c0749f55ca4fcf3e2bdc23e (patch) | |
tree | 46890e5788964978c5ab0ea915decf8dbd772929 /drivers/mmc | |
parent | 2b12797c59d60379858050255046dacfbee68a8b (diff) |
[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')
-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 55093ad132ca..ebfaa9960939 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) | |||
520 | /* | 520 | /* |
521 | * Block length register is only 10 bits before PXA27x. | 521 | * Block length register is only 10 bits before PXA27x. |
522 | */ | 522 | */ |
523 | mmc->max_blk_size = (cpu_is_pxa21x() || cpu_is_pxa25x()) ? 1023 : 2048; | 523 | mmc->max_blk_size = cpu_is_pxa25x() ? 1023 : 2048; |
524 | 524 | ||
525 | /* | 525 | /* |
526 | * Block count register is 16 bits. | 526 | * Block count register is 16 bits. |
@@ -554,7 +554,7 @@ static int pxamci_probe(struct platform_device *pdev) | |||
554 | MMC_VDD_32_33|MMC_VDD_33_34; | 554 | MMC_VDD_32_33|MMC_VDD_33_34; |
555 | mmc->caps = 0; | 555 | mmc->caps = 0; |
556 | host->cmdat = 0; | 556 | host->cmdat = 0; |
557 | if (!cpu_is_pxa21x() && !cpu_is_pxa25x()) { | 557 | if (!cpu_is_pxa25x()) { |
558 | mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ; | 558 | mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ; |
559 | host->cmdat |= CMDAT_SDIO_INT_EN; | 559 | host->cmdat |= CMDAT_SDIO_INT_EN; |
560 | if (cpu_is_pxa300() || cpu_is_pxa310()) | 560 | if (cpu_is_pxa300() || cpu_is_pxa310()) |