summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/vpac270.c
diff options
context:
space:
mode:
authorEric Miao <eric.y.miao@gmail.com>2010-04-14 01:00:42 +0200
committerEric Miao <eric.y.miao@gmail.com>2010-05-11 17:25:04 +0200
commitf97cab28b1895ecb0aa317cc785bb209f57fc1e8 (patch)
tree6bb09cf5ff94d39fd1a7ed1691ceb7e0ea674955 /arch/arm/mach-pxa/vpac270.c
parentMAINTAINERS: New MAINTAINERS entries for Zipit Z2 and Voipac PXA270 (diff)
downloadlinux-f97cab28b1895ecb0aa317cc785bb209f57fc1e8.tar.xz
linux-f97cab28b1895ecb0aa317cc785bb209f57fc1e8.zip
[ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond
delay_detect in HZ is confusing, convert it to be millisecond based. And thus remove those unnecessary call to msecs_to_jiffies() at runtime for this field. Other constants are converted assuming HZ == 100, which are basically true for those platforms. The assignment in csb726.c was incorrect, and is fixed in this patch as a result. Signed-off-by: Eric Miao <eric.y.miao@gmail.com> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Acked-by: Marc Zyngier <maz@misterjones.org> Acked-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Daniel Mack <daniel@caiaq.de>
Diffstat (limited to 'arch/arm/mach-pxa/vpac270.c')
-rw-r--r--arch/arm/mach-pxa/vpac270.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c
index 0954c2433a98..9884fa978f16 100644
--- a/arch/arm/mach-pxa/vpac270.c
+++ b/arch/arm/mach-pxa/vpac270.c
@@ -240,7 +240,7 @@ static struct pxamci_platform_data vpac270_mci_platform_data = {
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
.gpio_card_detect = GPIO53_VPAC270_SD_DETECT_N,
.gpio_card_ro = GPIO52_VPAC270_SD_READONLY,
- .detect_delay = 20,
+ .detect_delay_ms = 200,
};
static void __init vpac270_mmc_init(void)