Commit f97cab28 authored by Eric Miao's avatar Eric Miao
Browse files

[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: default avatarEric Miao <eric.y.miao@gmail.com>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Acked-by: default avatarMarc Zyngier <maz@misterjones.org>
Acked-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Acked-by: default avatarMike Rapoport <mike@compulab.co.il>
Acked-by: default avatarDaniel Mack <daniel@caiaq.de>
parent e66b6d8e

arch/arm/mach-pxa/cm-x300.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

arch/arm/mach-pxa/colibri-pxa3xx.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -444,6 +444,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,
@@ -695,7 +696,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE