Commit e114cd33 authored by Linus Walleij's avatar Linus Walleij Committed by Ulf Hansson
Browse files

ARM: pxa: Delete platform data for CD/WP 



This deletes the platform data passed for card detect and
write protect from various PXA machines.

Make sure to keep .gpio_card_ro_invert as this is still in
use by some machines and needed to set the right flag to
the MMC core (will be cleaned up later).

Cc: Daniel Mack <daniel@zonque.org>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Bartosz Golaszewski <brgl@bgdev.pl>
Cc: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent c914a27c

arch/arm/mach-pxa/balloon3.c

+0 −2
Original line number Diff line number Diff line
@@ -290,8 +290,6 @@ static unsigned long balloon3_mmc_pin_config[] __initdata = { 


static struct pxamci_platform_data balloon3_mci_platform_data = {

	.ocr_mask		= MMC_VDD_32_33 | MMC_VDD_33_34,

	.gpio_card_detect	= -1,

	.gpio_card_ro		= -1,

	.gpio_power		= -1,

	.detect_delay_ms	= 200,

};

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

+0 −2
Original line number Diff line number Diff line
@@ -289,8 +289,6 @@ static inline void cmx270_init_ohci(void) {} 
#if defined(CONFIG_MMC) || defined(CONFIG_MMC_MODULE)

static struct pxamci_platform_data cmx270_mci_platform_data = {

	.ocr_mask		= MMC_VDD_32_33|MMC_VDD_33_34,

	.gpio_card_detect	= GPIO83_MMC_IRQ,

	.gpio_card_ro		= -1,

	.gpio_power		= GPIO105_MMC_POWER,

	.gpio_power_invert	= 1,

};

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

+0 −4
Original line number Diff line number Diff line
@@ -459,8 +459,6 @@ static inline void cm_x300_init_nand(void) {} 
static struct pxamci_platform_data cm_x300_mci_platform_data = {

	.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,

	.gpio_power		= -1,

};
@@ -493,8 +491,6 @@ static struct pxamci_platform_data cm_x300_mci2_platform_data = { 
	.ocr_mask		= MMC_VDD_32_33|MMC_VDD_33_34,

	.init 			= cm_x300_mci2_init,

	.exit			= cm_x300_mci2_exit,

	.gpio_card_detect	= -1,

	.gpio_card_ro		= -1,

	.gpio_power		= -1,

};

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

+3 −14
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ 
#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)

static struct pxamci_platform_data colibri_mci_platform_data = {

	.ocr_mask		= MMC_VDD_32_33 | MMC_VDD_33_34,

	.gpio_power		= -1,

	.gpio_card_ro		= -1,

	.detect_delay_ms	= 200,

};
@@ -71,21 +69,12 @@ static struct gpiod_lookup_table colibri_pxa320_mci_gpio_table = { 


static void __init colibri_mmc_init(void)

{

	if (machine_is_colibri()) {	/* PXA270 Colibri */

		colibri_mci_platform_data.gpio_card_detect =

			GPIO0_COLIBRI_PXA270_SD_DETECT;

	if (machine_is_colibri())	/* PXA270 Colibri */

		gpiod_add_lookup_table(&colibri_pxa270_mci_gpio_table);

	}

	if (machine_is_colibri300()) {	/* PXA300 Colibri */

		colibri_mci_platform_data.gpio_card_detect =

			GPIO13_COLIBRI_PXA300_SD_DETECT;

	if (machine_is_colibri300())	/* PXA300 Colibri */

		gpiod_add_lookup_table(&colibri_pxa300_mci_gpio_table);

	}

	else {				/* PXA320 Colibri */

		colibri_mci_platform_data.gpio_card_detect =

			GPIO28_COLIBRI_PXA320_SD_DETECT;

	else				/* PXA320 Colibri */

		gpiod_add_lookup_table(&colibri_pxa320_mci_gpio_table);

	}



	pxa_set_mci_info(&colibri_mci_platform_data);

}

arch/arm/mach-pxa/colibri-pxa270-income.c

+0 −2
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ 
static struct pxamci_platform_data income_mci_platform_data = {

	.ocr_mask		= MMC_VDD_32_33 | MMC_VDD_33_34,

	.gpio_power		= -1,

	.gpio_card_detect	= GPIO0_INCOME_SD_DETECT,

	.gpio_card_ro		= GPIO0_INCOME_SD_RO,

	.detect_delay_ms	= 200,

};