diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2018-12-02 11:43:25 +0300 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2018-12-17 10:26:24 +0300 |
| commit | e114cd33e678a0d206d60b709f0f0dc26431fde4 (patch) | |
| tree | 9b73a6422572b31bfb778f4208bf58a54fa0196f /arch/arm/mach-pxa/colibri-evalboard.c | |
| parent | c914a27c92f91fe2206a035a3d1f9ac8f7ea1fe5 (diff) | |
| download | linux-e114cd33e678a0d206d60b709f0f0dc26431fde4.tar.xz | |
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: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'arch/arm/mach-pxa/colibri-evalboard.c')
| -rw-r--r-- | arch/arm/mach-pxa/colibri-evalboard.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/arch/arm/mach-pxa/colibri-evalboard.c b/arch/arm/mach-pxa/colibri-evalboard.c index 8d3772b1f6f5..2ccdef5de138 100644 --- a/arch/arm/mach-pxa/colibri-evalboard.c +++ b/arch/arm/mach-pxa/colibri-evalboard.c @@ -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); } |