diff options
author | Eric Miao <eric.y.miao@gmail.com> | 2010-04-14 07:00:42 +0800 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2010-05-11 17:25:04 +0200 |
commit | f97cab28b1895ecb0aa317cc785bb209f57fc1e8 (patch) | |
tree | 6bb09cf5ff94d39fd1a7ed1691ceb7e0ea674955 /arch/arm/mach-pxa/stargate2.c | |
parent | e66b6d8e86a67c637203684ab76ea760dccb10f9 (diff) | |
download | linux-stable-f97cab28b1895ecb0aa317cc785bb209f57fc1e8.tar.gz linux-stable-f97cab28b1895ecb0aa317cc785bb209f57fc1e8.tar.bz2 linux-stable-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/stargate2.c')
-rw-r--r-- | arch/arm/mach-pxa/stargate2.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c index 2041eb1d90ba..af40d2a12d37 100644 --- a/arch/arm/mach-pxa/stargate2.c +++ b/arch/arm/mach-pxa/stargate2.c @@ -464,8 +464,6 @@ static struct platform_device smc91x_device = { -static struct pxamci_platform_data stargate2_mci_platform_data; - /* * The card detect interrupt isn't debounced so we delay it by 250ms * to give the card a chance to fully insert / eject. @@ -489,8 +487,6 @@ static int stargate2_mci_init(struct device *dev, goto free_power_en; } gpio_direction_input(SG2_GPIO_nSD_DETECT); - /* Delay to allow for full insertion */ - stargate2_mci_platform_data.detect_delay = msecs_to_jiffies(250); err = request_irq(IRQ_GPIO(SG2_GPIO_nSD_DETECT), stargate2_detect_int, @@ -529,6 +525,7 @@ static void stargate2_mci_exit(struct device *dev, void *data) } static struct pxamci_platform_data stargate2_mci_platform_data = { + .detect_delay_ms = 250, .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, .init = stargate2_mci_init, .setpower = stargate2_mci_setpower, |