pxa: make it clear by converting MMC 'delay_detect' to millisecond
PATCH 1/1 pxa: make it clear by converting MMC 'delay_detect' to millisecond
commit 4db1d6645934f49806bd1b49ae4c4176e9b7c843
Author: Eric Miao <[email protected]> Date: Wed Apr 14 07:00:42 2010 +0800
[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.
arch/arm/mach-pxa/cm-x300.c +1 -1
@@ -433,7 +433,7 @@ static inline void cm_x300_init_nand(void) {}#if defined(CONFIG_MMC ) || defined(CONFIG_MMC_MODULE )static struct pxamci_platform_data cm_x300_mci_platform_data = { - .detect_delay =20 , + .detect_delay_ms =200 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .gpio_card_detect =GPIO82_MMC_IRQ , .gpio_card_ro = GPIO85_MMC_WP,
@@ -454,7 +454,7 @@ static void cm_x300_mci2_exit(struct device *dev,
void *data)
}
static struct pxamci_platform_data cm_x300_mci2_platform_data = {
- .detect_delay = 20,
+ .detect_delay_ms = 200,
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
.init = cm_x300_mci2_init,
.exit = cm_x300_mci2_exit,
(quoted diff) +0 -0
b/arch/arm/mach-pxa/colibri-pxa3xx.c
index e6c0a22..199afa2 100644
arch/arm/mach-pxa/colibri-pxa3xx.c +0 -0
@@ -96,7 +96,7 @@ static void colibri_pxa3xx_mci_exit(struct device
*dev, void *data)
}
static struct pxamci_platform_data colibri_pxa3xx_mci_platform_data = {
- .detect_delay = 20,
+ .detect_delay_ms = 200,
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
.init = colibri_pxa3xx_mci_init,
.exit = colibri_pxa3xx_mci_exit,
arch/arm/mach-pxa/corgi.c +1 -1
@@ -437,6 +437,7 @@ static struct platform_device corgiled_device = {* to give the card a chance to fully insert/eject. */ static struct pxamci_platform_data corgi_mci_platform_data = { + .detect_delay_ms =250 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .gpio_card_detect =-1 , .gpio_card_ro = CORGI_GPIO_nSD_WP,
@@ -679,7 +680,6 @@ static void __init corgi_init(void)corgi_init_spi ();pxa_set_udc_info (&udc_info); - corgi_mci_platform_data.detect_delay =msecs_to_jiffies (250 );pxa_set_mci_info (&corgi_mci_platform_data);pxa_set_ficp_info (&corgi_ficp_platform_data);pxa_set_i2c_info (NULL );
arch/arm/mach-pxa/csb726.c +1 -10
@@ -125,18 +125,9 @@ static unsigned long csb726_pin_config[] = { GPIO118_I2C_SDA, }; -static struct pxamci_platform_data csb726_mci_data; - -static int csb726_mci_init (struct device *dev, -irq_handler_t detect,void *data) -{ - csb726_mci_data.detect_delay =msecs_to_jiffies (500 ); -return 0 ; -} -static struct pxamci_platform_data csb726_mci = { + .detect_delay_ms =500 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , - .init = csb726_mci_init,/* FIXME setpower */ .gpio_card_detect =CSB726_GPIO_MMC_DETECT , .gpio_card_ro =CSB726_GPIO_MMC_RO ,
arch/arm/mach-pxa/em-x270.c +1 -1
@@ -626,6 +626,7 @@ static int em_x270_mci_get_ro(struct device *dev) }static struct pxamci_platform_data em_x270_mci_platform_data = { + .detect_delay_ms =250 , .ocr_mask =MMC_VDD_20_21 |MMC_VDD_21_22 |MMC_VDD_22_23 |MMC_VDD_24_25 |MMC_VDD_25_26 |MMC_VDD_26_27 | MMC_VDD_27_28|MMC_VDD_28_29|MMC_VDD_29_30|
@@ -643,7 +644,6 @@ static void __init em_x270_init_mmc(void)if (machine_is_em_x270 ()) em_x270_mci_platform_data.get_ro = em_x270_mci_get_ro; - em_x270_mci_platform_data.detect_delay =msecs_to_jiffies (250 ); pxa_set_mci_info(&em_x270_mci_platform_data); }#else
(quoted diff) +0 -0
b/arch/arm/mach-pxa/include/mach/mmc.h
index 02a69dc..9eb515b 100644
arch/arm/mach-pxa/include/mach/mmc.h +0 -1
@@ -9,7 +9,7 @@ struct mmc_host;struct pxamci_platform_data {unsigned int ocr_mask;/* available voltages */ -unsigned long detect_delay;/* delay in jiffies before detecting
cards after interrupt */
+ unsigned long detect_delay_ms; /* delay in millisecond before
detecting cards after interrupt */
int (*init)(struct device *, irq_handler_t , void *); int (*get_ro)(struct device *);
void (*setpower)(struct device *, unsigned int);
arch/arm/mach-pxa/littleton.c +1 -1
@@ -272,7 +272,7 @@ static inline void littleton_init_keypad(void) {}#if defined(CONFIG_MMC_PXA ) || defined(CONFIG_MMC_PXA_MODULE )static struct pxamci_platform_data littleton_mci_platform_data = { - .detect_delay =20 , + .detect_delay_ms =200 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .gpio_card_detect =GPIO_MMC1_CARD_DETECT , .gpio_card_ro = -1,
arch/arm/mach-pxa/lubbock.c +1 -1
@@ -478,7 +478,7 @@ static void lubbock_mci_exit(struct device *dev, void *data)static struct pxamci_platform_data lubbock_mci_platform_data = { .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , - .detect_delay =1 , + .detect_delay_ms =10 , .init = lubbock_mci_init, .get_ro = lubbock_mci_get_ro, .exit = lubbock_mci_exit,
arch/arm/mach-pxa/mioa701.c +1 -1
@@ -425,6 +425,7 @@ struct gpio_vbus_mach_info gpio_vbus_data = {* to give the card a chance to fully insert/eject. */ static struct pxamci_platform_data mioa701_mci_info = { + .detect_delay_ms =250 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .gpio_card_detect =GPIO15_SDIO_INSERT , .gpio_card_ro =GPIO78_SDIO_RO ,
@@ -790,7 +791,6 @@ static void __init mioa701_machine_init(void)mio_gpio_request (ARRAY_AND_SIZE (global_gpios));bootstrap_init ();set_pxa_fb_info (&mioa701_pxafb_info); - mioa701_mci_info.detect_delay =msecs_to_jiffies (250 );pxa_set_mci_info (&mioa701_mci_info);pxa_set_keypad_info (&mioa701_keypad_info);wm97xx_bat_set_pdata (&mioa701_battery_data);
arch/arm/mach-pxa/mxm8x10.c +1 -1
@@ -325,7 +325,7 @@ static mfp_cfg_t mfp_cfg[] __initdata = {#if defined(CONFIG_MMC )static struct pxamci_platform_data mxm_8x10_mci_platform_data = { .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , - .detect_delay =1 , + .detect_delay_ms =10 , .gpio_card_detect = MXM_8X10_SD_nCD, .gpio_card_ro =MXM_8X10_SD_WP , .gpio_power = -1
arch/arm/mach-pxa/palmld.c +0 -0
@@ -168,7 +168,7 @@ static struct pxamci_platform_data
palmld_mci_platform_data = {
.gpio_card_detect = GPIO_NR_PALMLD_SD_DETECT_N,
.gpio_card_ro = GPIO_NR_PALMLD_SD_READONLY,
.gpio_power = GPIO_NR_PALMLD_SD_POWER,
- .detect_delay = 20,
+ .detect_delay_ms = 200,
};
/******************************************************************************
arch/arm/mach-pxa/palmt5.c +0 -0
@@ -110,7 +110,7 @@ static struct pxamci_platform_data
palmt5_mci_platform_data = {
.gpio_card_detect = GPIO_NR_PALMT5_SD_DETECT_N,
.gpio_card_ro = GPIO_NR_PALMT5_SD_READONLY,
.gpio_power = GPIO_NR_PALMT5_SD_POWER,
- .detect_delay = 20,
+ .detect_delay_ms = 200,
};
/******************************************************************************
arch/arm/mach-pxa/palmtc.c +0 -0
@@ -121,7 +121,7 @@ static struct pxamci_platform_data
palmtc_mci_platform_data = {
.gpio_power = GPIO_NR_PALMTC_SD_POWER,
.gpio_card_ro = GPIO_NR_PALMTC_SD_READONLY,
.gpio_card_detect = GPIO_NR_PALMTC_SD_DETECT_N,
- .detect_delay = 20,
+ .detect_delay_ms = 200,
};
/******************************************************************************
arch/arm/mach-pxa/palmtx.c +0 -0
@@ -170,7 +170,7 @@ static struct pxamci_platform_data
palmtx_mci_platform_data = {
.gpio_card_detect = GPIO_NR_PALMTX_SD_DETECT_N,
.gpio_card_ro = GPIO_NR_PALMTX_SD_READONLY,
.gpio_power = GPIO_NR_PALMTX_SD_POWER,
- .detect_delay = 20,
+ .detect_delay_ms = 200,
};
/******************************************************************************
(quoted diff) +0 -0
b/arch/arm/mach-pxa/pcm990-baseboard.c
index 9d0ecea..f56ae10 100644
arch/arm/mach-pxa/pcm990-baseboard.c +1 -1
@@ -326,7 +326,7 @@ static void pcm990_mci_exit(struct device *dev, void *data)#define MSECS_PER_JIFFY (1000/HZ)static struct pxamci_platform_data pcm990_mci_platform_data = { - .detect_delay =250 /MSECS_PER_JIFFY , + .detect_delay_ms =250 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .init = pcm990_mci_init, .setpower = pcm990_mci_setpower,
arch/arm/mach-pxa/poodle.c +1 -1
@@ -277,6 +277,7 @@ static void poodle_mci_exit(struct device *dev, void *data) }static struct pxamci_platform_data poodle_mci_platform_data = { + .detect_delay_ms =250 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .init = poodle_mci_init, .setpower = poodle_mci_setpower,
@@ -450,7 +451,6 @@ static void __init poodle_init(void)set_pxa_fb_parent (&poodle_locomo_device.dev);set_pxa_fb_info (&poodle_fb_info);pxa_set_udc_info (&udc_info); - poodle_mci_platform_data.detect_delay =msecs_to_jiffies (250 );pxa_set_mci_info (&poodle_mci_platform_data);pxa_set_ficp_info (&poodle_ficp_platform_data);pxa_set_i2c_info (NULL );
arch/arm/mach-pxa/raumfeld.c +0 -0
@@ -716,7 +716,7 @@ static void raumfeld_mci_exit(struct device *dev,
void *data)
static struct pxamci_platform_data raumfeld_mci_platform_data = {
.init = raumfeld_mci_init,
.exit = raumfeld_mci_exit,
- .detect_delay = 20,
+ .detect_delay_ms = 200,
.gpio_card_detect = -1,
.gpio_card_ro = -1,
.gpio_power = -1,
arch/arm/mach-pxa/spitz.c +0 -0
@@ -537,6 +537,7 @@ static void spitz_mci_setpower(struct device *dev,
unsigned int vdd)
}
static struct pxamci_platform_data spitz_mci_platform_data = {
+ .detect_delay_ms = 250,
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
.setpower = spitz_mci_setpower,
.gpio_card_detect = SPITZ_GPIO_nSD_DETECT,
@@ -757,7 +758,6 @@ static void __init common_init(void)
spitz_init_spi();
platform_add_devices(devices, ARRAY_SIZE(devices));
- spitz_mci_platform_data.detect_delay = msecs_to_jiffies(250);
pxa_set_mci_info(&spitz_mci_platform_data); pxa_set_ohci_info(&spitz_ohci_platform_data); pxa_set_ficp_info(&spitz_ficp_platform_data);
arch/arm/mach-pxa/stargate2.c +0 -4
@@ -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,
arch/arm/mach-pxa/tosa.c +1 -1
@@ -275,6 +275,7 @@ static void tosa_mci_exit(struct device *dev, void *data) }static struct pxamci_platform_data tosa_mci_platform_data = { + .detect_delay_ms =250 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .init = tosa_mci_init, .exit = tosa_mci_exit,
@@ -926,7 +927,6 @@ static void __init tosa_init(void) dummy =gpiochip_reserve (TOSA_SCOOP_JC_GPIO_BASE ,12 ); dummy =gpiochip_reserve (TOSA_TC6393XB_GPIO_BASE ,16 ); - tosa_mci_platform_data.detect_delay =msecs_to_jiffies (250 );pxa_set_mci_info (&tosa_mci_platform_data);pxa_set_udc_info (&udc_info);pxa_set_ficp_info (&tosa_ficp_platform_data);
arch/arm/mach-pxa/trizeps4.c +0 -0
@@ -349,7 +349,7 @@ static void trizeps4_mci_exit(struct device *dev,
void *data)
static struct pxamci_platform_data trizeps4_mci_platform_data = {
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
- .detect_delay = 1,
+ .detect_delay_ms= 10,
.init = trizeps4_mci_init,
.exit = trizeps4_mci_exit,
.get_ro = NULL, /* write-protection not supported */
arch/arm/mach-pxa/vpac270.c +0 -0
@@ -191,7 +191,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)
arch/arm/mach-pxa/z2.c +1 -1
@@ -291,7 +291,7 @@ static struct pxamci_platform_data z2_mci_platform_data = { .gpio_card_detect = GPIO96_ZIPITZ2_SD_DETECT, .gpio_power = -1, .gpio_card_ro = -1, - .detect_delay = 20, + .detect_delay_ms = 200, };static void __init z2_mmc_init (void )
arch/arm/mach-pxa/zeus.c +1 -1
@@ -644,7 +644,7 @@ static struct pxafb_mach_info zeus_fb_info = {static struct pxamci_platform_data zeus_mci_platform_data = { .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , - .detect_delay =HZ /4 , + .detect_delay_ms =250 , .gpio_card_detect =ZEUS_MMC_CD_GPIO , .gpio_card_ro =ZEUS_MMC_WP_GPIO , .gpio_card_ro_invert =1 ,
arch/arm/mach-pxa/zylonite.c +1 -1
@@ -218,7 +218,7 @@ static inline void zylonite_init_lcd(void) {}#if defined(CONFIG_MMC )static struct pxamci_platform_data zylonite_mci_platform_data = { - .detect_delay =20 , + .detect_delay_ms=200 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .gpio_card_detect =EXT_GPIO (0 ), .gpio_card_ro = EXT_GPIO(2),
@@ -226,7 +226,7 @@ static struct pxamci_platform_data
zylonite_mci_platform_data = {
};
static struct pxamci_platform_data zylonite_mci2_platform_data = {
- .detect_delay = 20,
+ .detect_delay_ms= 200,
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
.gpio_card_detect = EXT_GPIO(1),
.gpio_card_ro = EXT_GPIO(3),
@@ -234,7 +234,7 @@ static struct pxamci_platform_data zylonite_mci2_platform_data = {
};
static struct pxamci_platform_data zylonite_mci3_platform_data = {
- .detect_delay = 20,
+ .detect_delay_ms= 200,
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
.gpio_card_detect = EXT_GPIO(30),
.gpio_card_ro = EXT_GPIO(31),
drivers/mmc/host/pxamci.c +1 -1
@@ -543,7 +543,7 @@ static irqreturn_t pxamci_detect_irq(int irq, void *devid) {struct pxamci_host *host =mmc_priv (devid); -mmc_detect_change (devid, host->pdata->detect_delay); +mmc_detect_change (devid,msecs_to_jiffies (host->pdata->detect_delay_ms));return IRQ_HANDLED ; }
Robert Jarzmik
maintainerPATCH 1/1 pxa: make it clear by converting MMC 'delay_detect' to millisecond
Quoted 11 lines · Eric Miao
commit
4db1d6645934f49806bd1b49ae4c4176e9b7c843Author: Eric Miao <[email protected]> Date: Wed Apr 14 07:00:42 2010 +0800[ARM] pxa: make it clear by converting MMC '
delay_detect' to millisecond
delay_detectin HZ is confusing, convert it to be millisecond based. And thus remove those unnecessary call tomsecs_to_jiffies()at runtime for this field. Other constants are converted assuming HZ == 100, which are basically true for those platforms.
Quoted 4 lines
The assignment in
csb726.cwas incorrect, and is fixed in this patch as a result.Signed-off-by Eric Miao <[email protected]>
For mioa701 part, please find my :
--
Robert
PATCH 1/1 pxa: make it clear by converting MMC 'delay_detect' to millisecond
Quoted 13 lines · Robert Jarzmik
Quoted 11 lines · Eric Miao
commit
4db1d6645934f49806bd1b49ae4c4176e9b7c843
Author: Eric Miao <[email protected]>
Date: ? Wed Apr 14 07:00:42 2010 +0800? ? [ARM] pxa: make it clear by converting MMC '
delay_detect' to millisecond? ?
delay_detectin HZ is confusing, convert it to be millisecond based. And ? ? thus remove those unnecessary call tomsecs_to_jiffies()at runtime for ? ? this field. Other constants are converted assuming HZ == 100, which are ? ? basically true for those platforms.
Quoted 8 lines
Quoted 4 lines
? ? The assignment in
csb726.cwas incorrect, and is fixed in this patch as ? ? a result.? ? Signed-off-by: Eric Miao <[email protected]>
For mioa701 part, please find my :
Acked-by Robert Jarzmik <[email protected]>
Thanks, Robert.
PATCH 1/1 pxa: make it clear by converting MMC 'delay_detect' to millisecond
In reply to Eric MiaoQuoted 11 lines · On Wed, 14 Apr 2010 07:08:13 +0800 Eric Miao <[email protected]> wrote:
commit
4db1d6645934f49806bd1b49ae4c4176e9b7c843Author: Eric Miao <[email protected]> Date: Wed Apr 14 07:00:42 2010 +0800[ARM] pxa: make it clear by converting MMC '
delay_detect' to millisecond
delay_detectin HZ is confusing, convert it to be millisecond based. And thus remove those unnecessary call tomsecs_to_jiffies()at runtime for this field. Other constants are converted assuming HZ == 100, which are basically true for those platforms.
Quoted 4 lines
The assignment in
csb726.cwas incorrect, and is fixed in this patch as a result.Signed-off-by Eric Miao <[email protected]>
For the Zeus part:
M.
Signature · 1 line
I'm the slime oozin' out from your TV set...
PATCH 1/1 pxa: make it clear by converting MMC 'delay_detect' to millisecond
In reply to Eric MiaoDne St 14. dubna 2010 01:08:13 Eric Miao napsal(a):
Quoted 12 lines
commit
4db1d6645934f49806bd1b49ae4c4176e9b7c843Author: Eric Miao <[email protected]> Date: Wed Apr 14 07:00:42 2010 +0800[ARM] pxa: make it clear by converting MMC '
delay_detect' to
millisecond
delay_detectin HZ is confusing, convert it to be millisecond based.
And thus remove those unnecessary call tomsecs_to_jiffies()at runtime for this field. Other constants are converted assuming HZ == 100, which are basically true for those platforms.
Quoted 5 lines
The assignment in
csb726.cwas incorrect, and is fixed in this patch as a result.Signed-off-by Eric Miao <[email protected]>
For Palm*, Voipac270 and ZipitZ2:
PATCH 1/1 pxa: make it clear by converting MMC 'delay_detect' to millisecond
In reply to Eric MiaoQuoted 11 lines · Eric Miao
commit
4db1d6645934f49806bd1b49ae4c4176e9b7c843Author: Eric Miao <[email protected]> Date: Wed Apr 14 07:00:42 2010 +0800[ARM] pxa: make it clear by converting MMC '
delay_detect' to millisecond
delay_detectin HZ is confusing, convert it to be millisecond based. And thus remove those unnecessary call tomsecs_to_jiffies()at runtime for this field. Other constants are converted assuming HZ == 100, which are basically true for those platforms.
Quoted 4 lines
The assignment in
csb726.cwas incorrect, and is fixed in this patch as a result.Signed-off-by Eric Miao <[email protected]>
For CM-X300 and EM-X270 parts:
Signature · 2 lines
Sincerely yours, Mike.
PATCH 1/1 pxa: make it clear by converting MMC 'delay_detect' to millisecond
In reply to Eric MiaoQuoted 11 lines · Eric Miao
commit
4db1d6645934f49806bd1b49ae4c4176e9b7c843Author: Eric Miao <[email protected]> Date: Wed Apr 14 07:00:42 2010 +0800[ARM] pxa: make it clear by converting MMC '
delay_detect' to millisecond
delay_detectin HZ is confusing, convert it to be millisecond based. And thus remove those unnecessary call tomsecs_to_jiffies()at runtime for this field. Other constants are converted assuming HZ == 100, which are basically true for those platforms.
Quoted 4 lines
The assignment in
csb726.cwas incorrect, and is fixed in this patch as a result.Signed-off-by Eric Miao <[email protected]>
For colibri and raumfeld:
Quoted 458 lines
arch/arm/mach-pxa/cm-x300.c +2
-2@@ -433,7 +433,7 @@ static inline void cm_x300_init_nand(void) {}#if defined(CONFIG_MMC ) || defined(CONFIG_MMC_MODULE )static struct pxamci_platform_data cm_x300_mci_platform_data = { - .detect_delay =20 , + .detect_delay_ms =200 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .gpio_card_detect =GPIO82_MMC_IRQ , .gpio_card_ro = GPIO85_MMC_WP,@@ -454,7 +454,7 @@ static void cm_x300_mci2_exit(struct device *dev, void *data) }static struct pxamci_platform_data cm_x300_mci2_platform_data = { - .detect_delay =20 , + .detect_delay_ms =200 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .init = cm_x300_mci2_init,arch/arm/mach-pxa/cm-x300.c +0
-0.exit = cm_x300_mci2_exit,arch/arm/mach-pxa/colibri-pxa3xx.c +1
-1@@ -96,7 +96,7 @@ static void colibri_pxa3xx_mci_exit(struct device *dev, void *data) }static struct pxamci_platform_data colibri_pxa3xx_mci_platform_data = { - .detect_delay =20 , + .detect_delay_ms =200 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .init = colibri_pxa3xx_mci_init,arch/arm/mach-pxa/colibri-pxa3xx.c +0
-0.exit = colibri_pxa3xx_mci_exit,arch/arm/mach-pxa/corgi.c +1
-1@@ -437,6 +437,7 @@ static struct platform_device corgiled_device = {* to give the card a chance to fully insert/eject. */ static struct pxamci_platform_data corgi_mci_platform_data = { + .detect_delay_ms =250 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .gpio_card_detect =-1 , .gpio_card_ro = CORGI_GPIO_nSD_WP,@@ -679,7 +680,6 @@ static void __init corgi_init(void)corgi_init_spi ();pxa_set_udc_info (&udc_info); - corgi_mci_platform_data.detect_delay =msecs_to_jiffies (250 );pxa_set_mci_info (&corgi_mci_platform_data);pxa_set_ficp_info (&corgi_ficp_platform_data);pxa_set_i2c_info (NULL );arch/arm/mach-pxa/csb726.c +1
-10@@ -125,18 +125,9 @@ static unsigned long csb726_pin_config[] = { GPIO118_I2C_SDA, }; -static struct pxamci_platform_data csb726_mci_data; - -static int csb726_mci_init (struct device *dev, -irq_handler_t detect,void *data) -{ - csb726_mci_data.detect_delay =msecs_to_jiffies (500 ); -return 0 ; -} -static struct pxamci_platform_data csb726_mci = { + .detect_delay_ms =500 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , - .init = csb726_mci_init,/* FIXME setpower */ .gpio_card_detect =CSB726_GPIO_MMC_DETECT , .gpio_card_ro =CSB726_GPIO_MMC_RO ,arch/arm/mach-pxa/em-x270.c +1
-1@@ -626,6 +626,7 @@ static int em_x270_mci_get_ro(struct device *dev) }static struct pxamci_platform_data em_x270_mci_platform_data = { + .detect_delay_ms =250 , .ocr_mask =MMC_VDD_20_21 |MMC_VDD_21_22 |MMC_VDD_22_23 |MMC_VDD_24_25 |MMC_VDD_25_26 |MMC_VDD_26_27 | MMC_VDD_27_28|MMC_VDD_28_29|MMC_VDD_29_30|@@ -643,7 +644,6 @@ static void __init em_x270_init_mmc(void)if (machine_is_em_x270 ()) em_x270_mci_platform_data.get_ro = em_x270_mci_get_ro; - em_x270_mci_platform_data.detect_delay =msecs_to_jiffies (250 ); pxa_set_mci_info(&em_x270_mci_platform_data); }#else arch/arm/mach-pxa/include/mach/mmc.h +0
-1@@ -9,7 +9,7 @@ struct mmc_host;struct pxamci_platform_data {unsigned int ocr_mask;/* available voltages */ -unsigned long detect_delay;/* delay in jiffies before detecting cards after interrupt */
arch/arm/mach-pxa/include/mach/mmc.h +1
-0+unsigned long detect_delay_ms;/* delay in millisecond before detecting cards after interrupt */
arch/arm/mach-pxa/include/mach/mmc.h +0
-0int (*init)(struct device *,irq_handler_t ,void *);int (*get_ro)(struct device *);void (*setpower)(struct device *,unsigned int );arch/arm/mach-pxa/littleton.c +1
-1@@ -272,7 +272,7 @@ static inline void littleton_init_keypad(void) {}#if defined(CONFIG_MMC_PXA ) || defined(CONFIG_MMC_PXA_MODULE )static struct pxamci_platform_data littleton_mci_platform_data = { - .detect_delay =20 , + .detect_delay_ms =200 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .gpio_card_detect =GPIO_MMC1_CARD_DETECT , .gpio_card_ro = -1,arch/arm/mach-pxa/lubbock.c +1
-1@@ -478,7 +478,7 @@ static void lubbock_mci_exit(struct device *dev, void *data)static struct pxamci_platform_data lubbock_mci_platform_data = { .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , - .detect_delay =1 , + .detect_delay_ms =10 , .init = lubbock_mci_init, .get_ro = lubbock_mci_get_ro, .exit = lubbock_mci_exit,arch/arm/mach-pxa/mioa701.c +1
-1@@ -425,6 +425,7 @@ struct gpio_vbus_mach_info gpio_vbus_data = {* to give the card a chance to fully insert/eject. */ static struct pxamci_platform_data mioa701_mci_info = { + .detect_delay_ms =250 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .gpio_card_detect =GPIO15_SDIO_INSERT , .gpio_card_ro =GPIO78_SDIO_RO ,@@ -790,7 +791,6 @@ static void __init mioa701_machine_init(void)mio_gpio_request (ARRAY_AND_SIZE (global_gpios));bootstrap_init ();set_pxa_fb_info (&mioa701_pxafb_info); - mioa701_mci_info.detect_delay =msecs_to_jiffies (250 );pxa_set_mci_info (&mioa701_mci_info);pxa_set_keypad_info (&mioa701_keypad_info);wm97xx_bat_set_pdata (&mioa701_battery_data);arch/arm/mach-pxa/mxm8x10.c +1
-1@@ -325,7 +325,7 @@ static mfp_cfg_t mfp_cfg[] __initdata = {#if defined(CONFIG_MMC )static struct pxamci_platform_data mxm_8x10_mci_platform_data = { .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , - .detect_delay =1 , + .detect_delay_ms =10 , .gpio_card_detect = MXM_8X10_SD_nCD, .gpio_card_ro =MXM_8X10_SD_WP , .gpio_power = -1arch/arm/mach-pxa/palmld.c +1
-1@@ -168,7 +168,7 @@ static struct pxamci_platform_data palmld_mci_platform_data = { .gpio_card_detect = GPIO_NR_PALMLD_SD_DETECT_N, .gpio_card_ro = GPIO_NR_PALMLD_SD_READONLY, .gpio_power = GPIO_NR_PALMLD_SD_POWER, - .detect_delay = 20, + .detect_delay_ms = 200, };/******************************************************************************
arch/arm/mach-pxa/palmt5.c +1
-1@@ -110,7 +110,7 @@ static struct pxamci_platform_data palmt5_mci_platform_data = { .gpio_card_detect = GPIO_NR_PALMT5_SD_DETECT_N, .gpio_card_ro = GPIO_NR_PALMT5_SD_READONLY, .gpio_power = GPIO_NR_PALMT5_SD_POWER, - .detect_delay = 20, + .detect_delay_ms = 200, };/******************************************************************************
arch/arm/mach-pxa/palmtc.c +1
-1@@ -121,7 +121,7 @@ static struct pxamci_platform_data palmtc_mci_platform_data = { .gpio_power = GPIO_NR_PALMTC_SD_POWER, .gpio_card_ro = GPIO_NR_PALMTC_SD_READONLY, .gpio_card_detect = GPIO_NR_PALMTC_SD_DETECT_N, - .detect_delay = 20, + .detect_delay_ms = 200, };/******************************************************************************
arch/arm/mach-pxa/palmtx.c +1
-1@@ -170,7 +170,7 @@ static struct pxamci_platform_data palmtx_mci_platform_data = { .gpio_card_detect = GPIO_NR_PALMTX_SD_DETECT_N, .gpio_card_ro = GPIO_NR_PALMTX_SD_READONLY, .gpio_power = GPIO_NR_PALMTX_SD_POWER, - .detect_delay = 20, + .detect_delay_ms = 200, };/******************************************************************************
arch/arm/mach-pxa/pcm990-baseboard.c +1
-1@@ -326,7 +326,7 @@ static void pcm990_mci_exit(struct device *dev, void *data)#define MSECS_PER_JIFFY (1000/HZ)static struct pxamci_platform_data pcm990_mci_platform_data = { - .detect_delay =250 /MSECS_PER_JIFFY , + .detect_delay_ms =250 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .init = pcm990_mci_init, .setpower = pcm990_mci_setpower,arch/arm/mach-pxa/poodle.c +1
-1@@ -277,6 +277,7 @@ static void poodle_mci_exit(struct device *dev, void *data) }static struct pxamci_platform_data poodle_mci_platform_data = { + .detect_delay_ms =250 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .init = poodle_mci_init, .setpower = poodle_mci_setpower,@@ -450,7 +451,6 @@ static void __init poodle_init(void)set_pxa_fb_parent (&poodle_locomo_device.dev);set_pxa_fb_info (&poodle_fb_info);pxa_set_udc_info (&udc_info); - poodle_mci_platform_data.detect_delay =msecs_to_jiffies (250 );pxa_set_mci_info (&poodle_mci_platform_data);pxa_set_ficp_info (&poodle_ficp_platform_data);pxa_set_i2c_info (NULL );arch/arm/mach-pxa/raumfeld.c +1
-1@@ -716,7 +716,7 @@ static void raumfeld_mci_exit(struct device *dev, void *data)static struct pxamci_platform_data raumfeld_mci_platform_data = { .init = raumfeld_mci_init, .exit = raumfeld_mci_exit, - .detect_delay =20 , + .detect_delay_ms =200 , .gpio_card_detect =-1 , .gpio_card_ro =-1 ,arch/arm/mach-pxa/raumfeld.c +0
-0.gpio_power = -1,arch/arm/mach-pxa/spitz.c +1
-0@@ -537,6 +537,7 @@ static void spitz_mci_setpower(struct device *dev, unsigned int vdd) }static struct pxamci_platform_data spitz_mci_platform_data = { + .detect_delay_ms =250 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .setpower = spitz_mci_setpower,arch/arm/mach-pxa/spitz.c +0
-1.gpio_card_detect = SPITZ_GPIO_nSD_DETECT,@@ -757,7 +758,6 @@ static void __init common_init(void)spitz_init_spi ();platform_add_devices (devices,ARRAY_SIZE (devices)); - spitz_mci_platform_data.detect_delay =msecs_to_jiffies (250 );pxa_set_mci_info (&spitz_mci_platform_data);pxa_set_ohci_info (&spitz_ohci_platform_data);pxa_set_ficp_info (&spitz_ficp_platform_data);arch/arm/mach-pxa/stargate2.c +1
-4@@ -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,arch/arm/mach-pxa/stargate2.c +0
-0.setpower = stargate2_mci_setpower,arch/arm/mach-pxa/tosa.c +1
-1@@ -275,6 +275,7 @@ static void tosa_mci_exit(struct device *dev, void *data) }static struct pxamci_platform_data tosa_mci_platform_data = { + .detect_delay_ms =250 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .init = tosa_mci_init, .exit = tosa_mci_exit,@@ -926,7 +927,6 @@ static void __init tosa_init(void) dummy =gpiochip_reserve (TOSA_SCOOP_JC_GPIO_BASE ,12 ); dummy =gpiochip_reserve (TOSA_TC6393XB_GPIO_BASE ,16 ); - tosa_mci_platform_data.detect_delay =msecs_to_jiffies (250 );pxa_set_mci_info (&tosa_mci_platform_data);pxa_set_udc_info (&udc_info);pxa_set_ficp_info (&tosa_ficp_platform_data);arch/arm/mach-pxa/trizeps4.c +1
-1@@ -349,7 +349,7 @@ static void trizeps4_mci_exit(struct device *dev, void *data)static struct pxamci_platform_data trizeps4_mci_platform_data = { .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , - .detect_delay =1 , + .detect_delay_ms=10 , .init = trizeps4_mci_init, .exit = trizeps4_mci_exit,arch/arm/mach-pxa/trizeps4.c +0
-0.get_ro = NULL, /* write-protection not supported */arch/arm/mach-pxa/vpac270.c +1
-1@@ -191,7 +191,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
__initvpac270_mmc_init(void)arch/arm/mach-pxa/z2.c +1
-1@@ -291,7 +291,7 @@ static struct pxamci_platform_data z2_mci_platform_data = { .gpio_card_detect = GPIO96_ZIPITZ2_SD_DETECT, .gpio_power = -1, .gpio_card_ro = -1, - .detect_delay = 20, + .detect_delay_ms = 200, };static void __init z2_mmc_init (void )arch/arm/mach-pxa/zeus.c +1
-1@@ -644,7 +644,7 @@ static struct pxafb_mach_info zeus_fb_info = {static struct pxamci_platform_data zeus_mci_platform_data = { .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , - .detect_delay =HZ /4 , + .detect_delay_ms =250 , .gpio_card_detect =ZEUS_MMC_CD_GPIO , .gpio_card_ro =ZEUS_MMC_WP_GPIO , .gpio_card_ro_invert =1 ,arch/arm/mach-pxa/zylonite.c +2
-2@@ -218,7 +218,7 @@ static inline void zylonite_init_lcd(void) {}#if defined(CONFIG_MMC )static struct pxamci_platform_data zylonite_mci_platform_data = { - .detect_delay =20 , + .detect_delay_ms=200 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .gpio_card_detect =EXT_GPIO (0 ), .gpio_card_ro = EXT_GPIO(2),@@ -226,7 +226,7 @@ static struct pxamci_platform_data zylonite_mci_platform_data = { };static struct pxamci_platform_data zylonite_mci2_platform_data = { - .detect_delay =20 , + .detect_delay_ms=200 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .gpio_card_detect =EXT_GPIO (1 ),arch/arm/mach-pxa/zylonite.c +1
-1.gpio_card_ro = EXT_GPIO(3),@@ -234,7 +234,7 @@ static struct pxamci_platform_data zylonite_mci2_platform_data = { };static struct pxamci_platform_data zylonite_mci3_platform_data = { - .detect_delay =20 , + .detect_delay_ms=200 , .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .gpio_card_detect =EXT_GPIO (30 ),arch/arm/mach-pxa/zylonite.c +0
-0.gpio_card_ro = EXT_GPIO(31),drivers/mmc/host/pxamci.c +1
-1@@ -543,7 +543,7 @@ static irqreturn_t pxamci_detect_irq(int irq, void *devid) {struct pxamci_host *host =mmc_priv (devid); -mmc_detect_change (devid, host->pdata->detect_delay); +mmc_detect_change (devid,msecs_to_jiffies (host->pdata->detect_delay_ms));return IRQ_HANDLED ; }_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel