Linus Walleij <linus.walleij@xxxxxxxxxx> writes:
> 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).
Hi Linus,
The title should begin with "ARM: pxa: " (pxa tree prefix). Moreover I think you
meant pxamci and not pcamci :)
> diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
> index 54989a0f59e0..e41d94e3c2c3 100644
> --- a/arch/arm/mach-pxa/em-x270.c
> +++ b/arch/arm/mach-pxa/em-x270.c
> @@ -577,15 +577,7 @@ static int em_x270_mci_init(struct device *dev,
> goto err_irq;
> }
>
> - if (machine_is_em_x270()) {
> - err = gpio_request(GPIO95_MMC_WP, "MMC WP");
> - if (err) {
> - dev_err(dev, "can't request MMC write protect: %d\n",
> - err);
> - goto err_gpio_wp;
> - }
> - gpio_direction_input(GPIO95_MMC_WP);
> - } else {
> + if (!machine_is_em_x270()) {
Euh why the "not" in the condition ?
> + if (!machine_is_em_x270())
> gpio_free(GPIO38_SD_PWEN);
Ditto.
> @@ -775,8 +775,6 @@ static struct pxamci_platform_data magician_mci_info = {
> .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
> .init = magician_mci_init,
> .exit = magician_mci_exit,
> - .gpio_card_detect = -1,
> - .gpio_card_ro = EGPIO_MAGICIAN_nSD_READONLY,
> .gpio_card_ro_invert = 1,
Shouldn't the gpio_card_ro_invert be removed as well here ?
Cheers.
--
Robert
