Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd546ee6 authored by Robert Jarzmik's avatar Robert Jarzmik Committed by Ulf Hansson
Browse files

mmc: pxamci: fix card detect with slot-gpio API 



Move pxamci to mmc slot-gpio API to fix interrupt request.

It fixes the case where the card detection is on a gpio expander, on I2C
for example on zylonite board. In this case, the card detect netsted
interrupt is called from a threaded interrupt. The request_irq() fails,
because a hard irq cannot be a nested interrupt from a threaded
interrupt (set __setup_irq()).

This was tested on zylonite and mioa701 boards.

Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Cc: Petr Cvek <petr.cvek@tul.cz>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 51424b28

drivers/mmc/host/pxamci.c

+22 −44
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/err.h>

#include <linux/err.h>

#include <linux/mmc/host.h>

#include <linux/mmc/host.h>

#include <linux/mmc/slot-gpio.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/regulator/consumer.h>

#include <linux/regulator/consumer.h>

#include <linux/gpio.h>

#include <linux/gpio.h>
@@ -454,12 +455,8 @@ static int pxamci_get_ro(struct mmc_host *mmc) 
{

{

	struct pxamci_host *host = mmc_priv(mmc);

	struct pxamci_host *host = mmc_priv(mmc);





	if (host->pdata && gpio_is_valid(host->pdata->gpio_card_ro)) {

	if (host->pdata && gpio_is_valid(host->pdata->gpio_card_ro))

		if (host->pdata->gpio_card_ro_invert)

		return mmc_gpio_get_ro(mmc);

			return !gpio_get_value(host->pdata->gpio_card_ro);

		else

			return gpio_get_value(host->pdata->gpio_card_ro);

	}

	if (host->pdata && host->pdata->get_ro)

	if (host->pdata && host->pdata->get_ro)

		return !!host->pdata->get_ro(mmc_dev(mmc));

		return !!host->pdata->get_ro(mmc_dev(mmc));

	/*

	/*
@@ -551,6 +548,7 @@ static void pxamci_enable_sdio_irq(struct mmc_host *host, int enable) 




static const struct mmc_host_ops pxamci_ops = {

static const struct mmc_host_ops pxamci_ops = {

	.request		= pxamci_request,

	.request		= pxamci_request,

	.get_cd			= mmc_gpio_get_cd,

	.get_ro			= pxamci_get_ro,

	.get_ro			= pxamci_get_ro,

	.set_ios		= pxamci_set_ios,

	.set_ios		= pxamci_set_ios,

	.enable_sdio_irq	= pxamci_enable_sdio_irq,

	.enable_sdio_irq	= pxamci_enable_sdio_irq,
@@ -790,37 +788,31 @@ static int pxamci_probe(struct platform_device *pdev) 
		gpio_power = host->pdata->gpio_power;

		gpio_power = host->pdata->gpio_power;

	}

	}

	if (gpio_is_valid(gpio_power)) {

	if (gpio_is_valid(gpio_power)) {

		ret = gpio_request(gpio_power, "mmc card power");

		ret = devm_gpio_request(&pdev->dev, gpio_power,

					"mmc card power");

		if (ret) {

		if (ret) {

			dev_err(&pdev->dev, "Failed requesting gpio_power %d\n", gpio_power);

			dev_err(&pdev->dev, "Failed requesting gpio_power %d\n",

				gpio_power);

			goto out;

			goto out;

		}

		}

		gpio_direction_output(gpio_power,

		gpio_direction_output(gpio_power,

				      host->pdata->gpio_power_invert);

				      host->pdata->gpio_power_invert);

	}

	}

	if (gpio_is_valid(gpio_ro)) {

	if (gpio_is_valid(gpio_ro))

		ret = gpio_request(gpio_ro, "mmc card read only");

		ret = mmc_gpio_request_ro(mmc, gpio_ro);

	if (ret) {

	if (ret) {

		dev_err(&pdev->dev, "Failed requesting gpio_ro %d\n", gpio_ro);

		dev_err(&pdev->dev, "Failed requesting gpio_ro %d\n", gpio_ro);

			goto err_gpio_ro;

		goto out;

		}

	} else {

		gpio_direction_input(gpio_ro);

		mmc->caps |= host->pdata->gpio_card_ro_invert ?

	}

			MMC_CAP2_RO_ACTIVE_HIGH : 0;

	if (gpio_is_valid(gpio_cd)) {

		ret = gpio_request(gpio_cd, "mmc card detect");

		if (ret) {

			dev_err(&pdev->dev, "Failed requesting gpio_cd %d\n", gpio_cd);

			goto err_gpio_cd;

	}

	}

		gpio_direction_input(gpio_cd);





		ret = request_irq(gpio_to_irq(gpio_cd), pxamci_detect_irq,

	if (gpio_is_valid(gpio_cd))

				  IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

		ret = mmc_gpio_request_cd(mmc, gpio_cd, 0);

				  "mmc card detect", mmc);

	if (ret) {

	if (ret) {

			dev_err(&pdev->dev, "failed to request card detect IRQ\n");

		dev_err(&pdev->dev, "Failed requesting gpio_cd %d\n", gpio_cd);

			goto err_request_irq;

		goto out;

		}

	}

	}





	if (host->pdata && host->pdata->init)

	if (host->pdata && host->pdata->init)
@@ -835,12 +827,6 @@ static int pxamci_probe(struct platform_device *pdev) 




	return 0;

	return 0;





err_request_irq:

	gpio_free(gpio_cd);

err_gpio_cd:

	gpio_free(gpio_ro);

err_gpio_ro:

	gpio_free(gpio_power);

out:

out:

	if (host) {

	if (host) {

		if (host->dma_chan_rx)

		if (host->dma_chan_rx)
@@ -873,14 +859,6 @@ static int pxamci_remove(struct platform_device *pdev) 
			gpio_ro = host->pdata->gpio_card_ro;

			gpio_ro = host->pdata->gpio_card_ro;

			gpio_power = host->pdata->gpio_power;

			gpio_power = host->pdata->gpio_power;

		}

		}

		if (gpio_is_valid(gpio_cd)) {

			free_irq(gpio_to_irq(gpio_cd), mmc);

			gpio_free(gpio_cd);

		}

		if (gpio_is_valid(gpio_ro))

			gpio_free(gpio_ro);

		if (gpio_is_valid(gpio_power))

			gpio_free(gpio_power);

		if (host->vcc)

		if (host->vcc)

			regulator_put(host->vcc);

			regulator_put(host->vcc);